summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml1
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml51
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java46
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java86
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java91
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java49
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java36
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java129
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java54
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java158
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java85
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java43
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java28
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java60
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java64
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java54
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java171
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java27
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java32
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java59
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java79
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java171
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml26
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite35
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml26
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz1
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite30
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd24
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/import-xyz.xsd29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java146
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml1
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/LICENSE205
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/NOTICE6
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml88
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java106
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java190
37 files changed, 0 insertions, 2520 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
index 4dc95deb3d..8c81252e57 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
@@ -136,7 +136,6 @@
<module>transaction</module>
<module>validation</module>
<module>wires</module>
- <module>workspace-manager</module>
<module>wsdl</module>
<module>wsdlgen</module>
<module>wsdlless</module>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml
deleted file mode 100644
index ebf4c9fcf4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-workspace-manager</artifactId>
- <name>Apache Tuscany SCA iTest Workspace Manager</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-workspace-manager</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly-xml</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
deleted file mode 100644
index 3d12ddfdd2..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.artifact.xyz;
-
-import org.apache.tuscany.sca.assembly.impl.BaseImpl;
-
-
-public class XYZ extends BaseImpl {
-
- private String anAttribute;
-
- /**
- * Get the module name
- * @return
- */
- public String getAnAttribute(){
- return anAttribute;
- }
-
- /**
- * Sets the module name
- * @param pojoName
- */
- public void setAnAttribute(String anAttribute){
- this.anAttribute = anAttribute;
- }
-
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
deleted file mode 100644
index ee8c881d22..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.artifact.xyz;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.imprt.xyz.ImportXYZ;
-
-/**
- * A Model Resolver for Composite models.
- *
- * @version $Rev$ $Date$
- */
-public class XYZModelResolver implements ModelResolver {
-
- private Map<String, XYZ> map = new HashMap<String, XYZ>();
- private Contribution contribution;
-
- public XYZModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
- this.contribution = contribution;
- }
-
- public void addModel(Object resolved) {
- XYZ xyz = (XYZ)resolved;
- map.put(xyz.getAnAttribute(), xyz);
- }
-
- public Object removeModel(Object resolved) {
- return map.remove(((XYZ)resolved).getAnAttribute());
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
- XYZ xyz = (XYZ)unresolved;
-
- XYZ resolved = map.get(xyz.getAnAttribute());
- if (resolved != null) {
- return modelClass.cast(resolved);
- }
-
- // No definition found, delegate the resolution to the imports
- for (Import import_ : this.contribution.getImports()) {
- if (import_ instanceof ImportXYZ) {
- ImportXYZ importXYZ = (ImportXYZ)import_;
-
- if (xyz.getAnAttribute().equals(importXYZ.getAnAttribute())) {
-
- // Delegate the resolution to the import resolver
- resolved = importXYZ.getModelResolver().resolveModel(XYZ.class, (XYZ)unresolved);
- if (!resolved.isUnresolved()) {
- return modelClass.cast(resolved);
- }
- }
- }
- }
-
- return (T)unresolved;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
deleted file mode 100644
index a0c7c899ec..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.artifact.xyz;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
-
-/**
- * An ArtifactProcessor for XYZ documents.
- *
- * @version $Rev$ $Date$
- */
-public class XYZProcessor implements URLArtifactProcessor<XYZ> {
-
- private XMLInputFactory inputFactory;
- private Monitor monitor;
-
- public XYZProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
- this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
- this.monitor = monitor;
- }
-
- /**
- * Report a exception.
- *
- * @param problems
- * @param message
- * @param model
- */
- private void error(String message, Object model, Exception ex) {
- if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex);
- monitor.problem(problem);
- }
- }
-
- public XYZ read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
- try {
- XYZ xyz = new XYZ();
- String attribute = artifactURL.toString();
- xyz.setAnAttribute(attribute.substring(attribute.lastIndexOf('/') + 1));
- return xyz;
- } catch (Exception e) {
- ContributionReadException ce = new ContributionReadException(e);
- error("ContributionReadException", artifactURL, ce);
- throw ce;
- }
- }
-
- public void resolve(XYZ model, ModelResolver resolver) throws ContributionResolveException {
- }
-
- public String getArtifactType() {
- return ".xyz";
- }
-
- public Class<XYZ> getModelType() {
- return XYZ.class;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
deleted file mode 100644
index c7df99691b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-public interface ImplementationXYZ extends Implementation {
-
- /**
- * Get the module name
- * @return
- */
- public String getAnAttribute();
-
- /**
- * Sets the module name
- * @param pojoName
- */
- public void setAnAttribute(String anAttribute);
-
-
- /**
- * Returns the modules methods.
- * @return
- */
- public Map<String, Method> getMethods();
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
deleted file mode 100644
index f0e3f20c15..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-
-/**
- * Factory for the implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface ImplementationXYZFactory {
-
- /**
- * Creates a new implementation model object.
- * @return a new implementation model object
- */
- ImplementationXYZ createImplementationXYZ();
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
deleted file mode 100644
index 1e457d2786..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-
-/**
- * A factory for the implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationXYZFactoryImpl implements ImplementationXYZFactory {
-
- public ImplementationXYZ createImplementationXYZ() {
- return new ImplementationXYZImpl();
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
deleted file mode 100644
index 42dcc2419d..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-
-
-/**
- * Represents an implementation in an SCA assembly.
- *
- * @version $Rev$ $Date$
- */
-class ImplementationXYZImpl implements ImplementationXYZ {
-
- private String anAttribute;
- private String uri;
- private Map<String, Method> methods;
- private List<Service> services = new ArrayList<Service>();
- private List<Reference> references = new ArrayList<Reference>();
- private List<Property> properties = new ArrayList<Property>();
- private boolean unresolved;
-
- ImplementationXYZImpl() {
- }
-
- /**
- * Returns the module name
- * @return
- */
- public String getAnAttribute() {
- return anAttribute;
- }
-
- /**
- * Sets the module name
- * @param pojoName
- */
- public void setAnAttribute(String anAttribute) {
- this.anAttribute = anAttribute;
- uri = anAttribute;
- }
-
-
- /**
- * Returns the methods.
- * @return
- */
- public Map<String, Method> getMethods() {
- return methods;
- }
-
- public ConstrainingType getConstrainingType() {
- // The sample implementation does not support constrainingTypes
- return null;
- }
-
- public List<Property> getProperties() {
- return properties;
- }
-
- public List<Service> getServices() {
- return services;
- }
-
- public List<Reference> getReferences() {
- return references;
- }
-
- public String getURI() {
- return uri;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The sample implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
- @Override
- public int hashCode() {
- return uri.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof ImplementationXYZImpl) {
- return ((ImplementationXYZImpl)obj).getURI().equals(uri);
- } else {
- return false;
- }
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
deleted file mode 100644
index 711f919339..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-class ImplementationXYZInvoker implements Invoker {
-
- private Object instance;
- private Method method;
-
- ImplementationXYZInvoker(Object instance, Operation operation, Method method) {
- this.instance = instance;
- this.method = method;
- }
-
- public Message invoke(Message msg) {
- // do something to invoke the implementation
- /*
- try {
- msg.setBody(method.invoke(instance, (Object[])msg.getBody()));
- } catch (InvocationTargetException e) {
- msg.setFaultBody(e);
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- */
- return msg;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
deleted file mode 100644
index 792732e73f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.artifact.xyz.XYZ;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-
-
-public class ImplementationXYZProcessor implements StAXArtifactProcessor<ImplementationXYZ> {
- private static final QName IMPLEMENTATION_XYZ = new QName("http://someuri", "implementation.xyz");
-
- private AssemblyFactory assemblyFactory;
- private ImplementationXYZFactory implementationXYZFactory;
- private PolicyFactory policyFactory;
- private PolicyAttachPointProcessor policyProcessor;
-
- public ImplementationXYZProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-
- // Get the assembly and Java interface factories as we'll need them to
- // create model objects
- assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- policyFactory = modelFactories.getFactory(PolicyFactory.class);
- implementationXYZFactory = modelFactories.getFactory(ImplementationXYZFactory.class);
- policyProcessor = new PolicyAttachPointProcessor(policyFactory);
- }
-
- public QName getArtifactType() {
- // Returns the qname of the XML element processed by this processor
- return IMPLEMENTATION_XYZ;
- }
-
- public Class<ImplementationXYZ> getModelType() {
- // Returns the type of model processed by this processor
- return ImplementationXYZ.class;
- }
-
- public ImplementationXYZ read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
- // Read an <implementation.xyz> element
- ImplementationXYZ implementation = implementationXYZFactory.createImplementationXYZ();
-
- // Read policies
- policyProcessor.readPolicies(implementation, reader);
-
- // Read the module attribute.
- String anAttribute = reader.getAttributeValue(null, "anAttribute");
- implementation.setAnAttribute(anAttribute);
-
- implementation.setUnresolved(true);
-
- // Skip to end element
- while (reader.hasNext()) {
- if (reader.next() == END_ELEMENT && IMPLEMENTATION_XYZ.equals(reader.getName())) {
- break;
- }
- }
-
- return implementation;
- }
-
- public void resolve(ImplementationXYZ implementation, ModelResolver resolver) throws ContributionResolveException {
-
- // Resolve the xyz implementation
- XYZ xyz = new XYZ();
- xyz.setAnAttribute(implementation.getAnAttribute());
-
- // First resolve its module
- XYZ resolved = resolver.resolveModel(XYZ.class, xyz);
-
- if (resolved == null){
- return;
- }
-
- // use this to check that the import/export association has been created
-
- // Check to see if we have a .componentType file describing the POJO class
- ComponentType componentType = assemblyFactory.createComponentType();
- componentType.setUnresolved(true);
- componentType.setURI(implementation.getURI() + ".componentType");
- componentType = resolver.resolveModel(ComponentType.class, componentType);
- if (!componentType.isUnresolved()) {
-
- // We have a component type description, merge it into the POJO model
- implementation.getServices().addAll(componentType.getServices());
- implementation.getReferences().addAll(componentType.getReferences());
- implementation.getProperties().addAll(componentType.getProperties());
-
- } else {
-
- // We have no component type description, simply introspect the POJO and
- // create a single Service for it
-/*
- Service service = assemblyFactory.createService();
- service.setName(pojoClass.getSimpleName());
- JavaInterface javaInterface;
- try {
- javaInterface = javaFactory.createJavaInterface(pojoClass);
- } catch (InvalidInterfaceException e) {
- throw new ContributionResolveException(e);
- }
- JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
- interfaceContract.setInterface(javaInterface);
- service.setInterfaceContract(interfaceContract);
- implementation.getServices().add(service);
-*/
- }
-
- // Mark the implementation resolved now
- implementation.setUnresolved(false);
- }
-
- public void write(ImplementationXYZ implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
- // Write <implementation.xyz> element
- writer.writeStartElement(IMPLEMENTATION_XYZ.getNamespaceURI(), IMPLEMENTATION_XYZ.getLocalPart());
- policyProcessor.writePolicyAttributes(implementation, writer);
-
- if (implementation.getAnAttribute() != null) {
- writer.writeAttribute("anAttribute", implementation.getAnAttribute());
- }
-
- writer.writeEndElement();
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
deleted file mode 100644
index 9d526b007f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ServiceRuntimeException;
-
-class ImplementationXYZProvider implements ImplementationProvider {
-
- private ImplementationXYZ implementation;
- private Object instance;
-
- /**
- * Constructs a new CRUD implementation.
- */
- ImplementationXYZProvider(RuntimeComponent component, ImplementationXYZ implementation) {
- this.implementation = implementation;
-
- // Create a new instance of the POJO
- try {
- //pojoInstance = implementation.getPOJOClass().newInstance();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public void start() {
- try {
- // Invoke the POJO's init method
- Method initMethod = implementation.getMethods().get("init");
- if (initMethod != null) {
- //initMethod.invoke(pojoInstance);
- }
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public void stop() {
- try {
- // Invoke the POJO's destroy method
- Method destroyMethod = implementation.getMethods().get("destroy");
- if (destroyMethod != null) {
- //destroyMethod.invoke(pojoInstance);
- }
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- } finally {
- instance = null;
- }
- }
-
- public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
- Method method = implementation.getMethods().get(operation.getName());
- ImplementationXYZInvoker invoker = new ImplementationXYZInvoker(instance, operation, method);
- return invoker;
- }
-
- public boolean supportsOneWayInvocation() {
- return false;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
deleted file mode 100644
index bb561008d8..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.implementation.xyz;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A factory for POJO implementation providers.
- */
-public class ImplementationXYZProviderFactory implements ImplementationProviderFactory<ImplementationXYZ> {
-
- public ImplementationXYZProviderFactory(ExtensionPointRegistry registry) {
- }
-
- public Class<ImplementationXYZ> getModelType() {
- // Returns the type of model processed by this processor
- return ImplementationXYZ.class;
- }
-
- public ImplementationProvider createImplementationProvider(RuntimeComponent component, ImplementationXYZ implementation) {
- return new ImplementationXYZProvider(component, implementation);
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
deleted file mode 100644
index b9a7bf6c0c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-/**
- * Default Import/Export model factory implementation
- *
- * @version $Rev$ $Date$
- */
-public class DefaultImportExportXYZFactory extends ImportExportXYZFactoryImpl implements ImportExportXYZFactory {
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
deleted file mode 100644
index b099cfee11..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-
-/**
- * The model of an export.
- *
- * @version $Rev$ $Date$
- */
-public interface ExportXYZ extends Export {
-
- /**
- * Get the uri of the contributions
- *
- * @return The URI
- */
- String getURI();
-
- /**
- * Set the uri of the contributions
- *
- * @param URI
- */
- void setURI(String URI);
-
- /**
- * Get anAttribute
- *
- * @return anAttribute
- */
- String getAnAttribute();
-
- /**
- * Set anAttribute
- *
- * @param anAttribute
- */
- void setAnAttribute(String anAttribute);
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
deleted file mode 100644
index 6e98979b5d..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The model of an export
- *
- * @version $Rev$ $Date$
- */
-public class ExportXYZImpl extends ExtensibleImpl implements ExportXYZ {
- private String URI;
- private String anAttribute;
- private ModelResolver modelResolver;
-
- protected ExportXYZImpl() {
- super();
- }
-
- public String getURI() {
- return URI;
- }
-
- public void setURI(String URI) {
- this.URI = URI;
- }
-
- public String getAnAttribute() {
- return anAttribute;
- }
-
- public void setAnAttribute(String anAttribute) {
- this.anAttribute = anAttribute;
- }
-
- public ModelResolver getModelResolver() {
- return modelResolver;
- }
-
- public void setModelResolver(ModelResolver modelResolver) {
- this.modelResolver = modelResolver;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
deleted file mode 100644
index c3d2663d62..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A model resolver for exports.
- *
- * @version $Rev$ $Date$
- */
-public class ExportXYZModelResolver implements ModelResolver {
-
- private ModelResolver resolver;
-
- public ExportXYZModelResolver(ModelResolver resolver) {
- this.resolver = resolver;
- }
-
- public void addModel(Object resolved) {
- throw new IllegalStateException();
- }
-
- public Object removeModel(Object resolved) {
- throw new IllegalStateException();
- }
-
- public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
- // Just delegate to the contribution's model resolver, namespace
- // based filtering is implemented in the model specific model
- // resolver, which know how to get the namespace of the particular
- // type of model that they handle
- return resolver.resolveModel(modelClass, unresolved);
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
deleted file mode 100644
index 7d4aafa31f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.ExtensionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
-
-
-public class ExportXYZProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ExportXYZ> {
-
- private static final String NS = "http://someuri";
- private static final QName EXPORT = new QName(NS, "export.xyz");
- private static final String URI = "uri";
- private static final String AN_ATTRIBUTE = "anAttribute";
-
- private final ImportExportXYZFactory factory;
- private final Monitor monitor;
- private final ExtensionFactory extensionFactory;
-
-
- public ExportXYZProcessor(ModelFactoryExtensionPoint modelFactories,
- Monitor monitor) {
- this.factory = modelFactories.getFactory(ImportExportXYZFactory.class);
- this.extensionFactory = modelFactories.getFactory(ExtensionFactory.class);
- this.monitor = monitor;
- }
-
- /**
- * Report a warning.
- *
- * @param problems
- * @param message
- * @param model
- */
- private void error(String message, Object model, Object... messageParameters) {
- if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "export-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
- monitor.problem(problem);
- }
- }
-
- /**
- * Report a exception.
- *
- * @param problems
- * @param message
- * @param model
- */
- private void error(String message, Object model, Exception ex) {
- if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "export-validation-messages", Severity.ERROR, model, message, ex);
- monitor.problem(problem);
- }
- }
-
- public QName getArtifactType() {
- return EXPORT;
- }
-
- public Class<ExportXYZ> getModelType() {
- return ExportXYZ.class;
- }
-
-
- public ExportXYZ read(XMLStreamReader reader) throws ContributionReadException {
- ExportXYZ export = this.factory.createExport();
- QName element = null;
-
- try {
- while (reader.hasNext()) {
- int event = reader.getEventType();
- switch (event) {
- case START_ELEMENT:
- element = reader.getName();
-
- // Read <export>
- if (EXPORT.equals(element)) {
- String ns = reader.getAttributeValue(null, URI);
- if (ns == null) {
- error("AttributeNameSpaceMissing", reader);
- } else {
- export.setURI(ns);
- }
-
- String anAttribute = reader.getAttributeValue(null, AN_ATTRIBUTE);
- export.setAnAttribute(anAttribute);
- }
-
- break;
- case XMLStreamConstants.END_ELEMENT:
- if (EXPORT.equals(reader.getName())) {
- return export;
- }
- break;
- }
-
- // Read the next element
- if (reader.hasNext()) {
- reader.next();
- }
- }
- }
- catch (XMLStreamException e) {
- ContributionReadException ex = new ContributionReadException(e);
- error("XMLStreamException", reader, ex);
- }
-
- return export;
- }
-
- public void write(ExportXYZ export, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
- // Write <export>
- writer.writeStartElement(EXPORT.getNamespaceURI(), EXPORT.getLocalPart());
-
- if (export.getURI() != null) {
- writer.writeAttribute(URI, export.getURI());
- }
-
- if (export.getAnAttribute() != null) {
- writer.writeAttribute(AN_ATTRIBUTE, export.getAnAttribute());
- }
-
- writer.writeEndElement();
- }
-
- public void resolve(ExportXYZ export, ModelResolver resolver) throws ContributionResolveException {
-
- if (export.getURI() != null)
- // Initialize the export's resolver
- export.setModelResolver(new ExportXYZModelResolver(resolver));
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
deleted file mode 100644
index db2bab7f99..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-public interface ImportExportXYZFactory {
-
- ImportXYZ createImport();
-
- ExportXYZ createExport();
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
deleted file mode 100644
index b0a9c80d88..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-public class ImportExportXYZFactoryImpl implements ImportExportXYZFactory {
-
- public ImportXYZ createImport() {
- return new ImportXYZImpl();
- }
-
- public ExportXYZ createExport() {
- return new ExportXYZImpl();
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
deleted file mode 100644
index 3e883e84a2..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * The representation of an XML namespace import.
- *
- * @version $Rev$ $Date$
- */
-public interface ImportXYZ extends Import {
-
- /**
- * Get the uri of the contributions
- *
- * @return The URI
- */
- String getURI();
-
- /**
- * Set the uri of the contributions
- *
- * @param URI
- */
- void setURI(String URI);
-
- /**
- * Get anAttribute
- *
- * @return anAttribute
- */
- String getAnAttribute();
-
- /**
- * Set anAttribute
- *
- * @param anAttribute
- */
- void setAnAttribute(String anAttribute);
-
-} \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
deleted file mode 100644
index ef3f0653f3..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an import for the contribution
- *
- * @version $Rev$ $Date$
- */
-public class ImportXYZImpl extends ExtensibleImpl implements ImportXYZ {
- private ModelResolver modelResolver;
-
- private String URI;
- private String anAttribute;
-
-
- protected ImportXYZImpl() {
- super();
- }
-
- public String getURI() {
- return URI;
- }
-
- public void setURI(String URI) {
- this.URI = URI;
- }
-
- public String getAnAttribute() {
- return anAttribute;
- }
-
- public void setAnAttribute(String anAttribute) {
- this.anAttribute = anAttribute;
- }
-
- public ModelResolver getModelResolver() {
- return modelResolver;
- }
-
- public void setModelResolver(ModelResolver modelResolver) {
- this.modelResolver = modelResolver;
- }
-
- public boolean match(Export export) {
- if (export instanceof ExportXYZ){
- return anAttribute.equals(((ExportXYZ)export).getAnAttribute());
- }
- return false;
- }
-
- @Override
- public String toString() {
- return String.valueOf(URI);
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
deleted file mode 100644
index 763fa30002..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.imprt.xyz;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.ExtensionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
-
-/**
- * Artifact processor for Namespace import
- *
- * @version $Rev$ $Date$
- */
-public class ImportXYZProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ImportXYZ> {
- private static final String NS = "http://someuri";
-
- private static final QName IMPORT = new QName(NS, "import.xyz");
-
- private static final String URI = "uri";
- private static final String AN_ATTRIBUTE = "anAttribute";
-
- private final ImportExportXYZFactory factory;
- private final ExtensionFactory extensionFactory;
- private final Monitor monitor;
-
- public ImportXYZProcessor(ModelFactoryExtensionPoint modelFactories,
- Monitor monitor) {
- this.factory = modelFactories.getFactory(ImportExportXYZFactory.class);
- this.monitor = monitor;
- this.extensionFactory = modelFactories.getFactory(ExtensionFactory.class);
- }
-
- /**
- * Report a warning.
- *
- * @param problems
- * @param message
- * @param model
- */
- private void error(String message, Object model, Object... messageParameters) {
- if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
- monitor.problem(problem);
- }
- }
-
- /**
- * Report a exception.
- *
- * @param problems
- * @param message
- * @param model
- */
- private void error(String message, Object model, Exception ex) {
- if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, ex);
- monitor.problem(problem);
- }
- }
-
- public QName getArtifactType() {
- return IMPORT;
- }
-
- public Class<ImportXYZ> getModelType() {
- return ImportXYZ.class;
- }
-
- public ImportXYZ read(XMLStreamReader reader) throws ContributionReadException {
- ImportXYZ importXYZ= this.factory.createImport();
- QName element;
-
- try {
- while (reader.hasNext()) {
- int event = reader.getEventType();
- switch (event) {
- case START_ELEMENT:
- element = reader.getName();
-
- // Read <import>
- if (IMPORT.equals(element)) {
- String ns = reader.getAttributeValue(null, URI);
- if (ns == null) {
- error("AttributeNameSpaceMissing", reader);
- } else {
- importXYZ.setURI(ns);
- }
-
- String anAttribute = reader.getAttributeValue(null, AN_ATTRIBUTE);
- if (anAttribute != null) {
- importXYZ.setAnAttribute(anAttribute);
- }
- }
- break;
- case XMLStreamConstants.END_ELEMENT:
- if (IMPORT.equals(reader.getName())) {
- return importXYZ;
- }
- break;
- }
-
- // Read the next element
- if (reader.hasNext()) {
- reader.next();
- }
- }
- }
- catch (XMLStreamException e) {
- ContributionReadException ex = new ContributionReadException(e);
- error("XMLStreamException", reader, ex);
- }
-
- return importXYZ;
- }
-
- public void write(ImportXYZ importXYZ, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
- // Write <import>
- writer.writeStartElement(IMPORT.getNamespaceURI(), IMPORT.getLocalPart());
-
- if (importXYZ.getURI() != null) {
- writer.writeAttribute(URI, importXYZ.getURI());
- }
- if (importXYZ.getAnAttribute() != null) {
- writer.writeAttribute(AN_ATTRIBUTE, importXYZ.getAnAttribute());
- }
-
- writer.writeEndElement();
- }
-
-
- public void resolve(ImportXYZ model, ModelResolver resolver) throws ContributionResolveException {
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
deleted file mode 100644
index c9f862856f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tns="http://someuri"
- xmlns:ans="http://someotheruri">
- <deployable composite="AComposite"/>
- <import namespace="http://test"/>
- <tns:import.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
deleted file mode 100644
index e26b16cb62..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tns="http://someuri"
- xmlns:test="http://test"
- targetNamespace="http://contrib1"
- name="AComposite">
-
- <component name="Component1">
- <tns:implementation.xyz anAttribute="abcdef.xyz"/>
- <reference name="component2" target="Component2"/>
- </component>
-
- <component name="Component2">
- <tns:implementation.xyz anAttribute="fghij"/>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
deleted file mode 100644
index 1c462196a3..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tns="http://someuri"
- xmlns:ans="http://someotheruri">
- <deployable composite="BComposite"/>
- <export namespace="http://test"/>
- <tns:export.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
deleted file mode 100644
index 037869c9ef..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
+++ /dev/null
@@ -1 +0,0 @@
-Empty File \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
deleted file mode 100644
index dde1226c6c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tns="http://someuri"
- targetNamespace="http://contrib2"
- name="BComposite">
-
- <component name="Component3">
- <tns:implementation.xyz anAttribute="abcdef.xyz"/>
- <reference name="component2" target="Component2"/>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
deleted file mode 100644
index 7527779cda..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://someuri"
- xmlns:tns="http://someuri"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- elementFormDefault="qualified">
-
- <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
- <element name="implementation.xyz" type="tns:XYZImplementation"/>
-
- <complexType name="XYZImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##targetNamespace" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="anAttribute" type="string" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-</schema> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/import-xyz.xsd b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/import-xyz.xsd
deleted file mode 100644
index e8535fe3a7..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/main/resources/import-xyz.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://someuri"
- xmlns:tns="http://someuri"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- elementFormDefault="qualified">
-
- <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
- <element name="import.xyz" type="tns:ImportXYZ" substitutionGroup="sca:baseImport"/>
-
- <element name="export.xyz" type="tns:ExportXYZ" substitutionGroup="sca:baseExport"/>
-
- <complexType name="ImportXYZ">
- <complexContent>
- <extension base="sca:BaseImportType">
- <attribute name="anAttribute" type="string"/>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="ExportXYZ">
- <complexContent>
- <extension base="sca:BaseExportType"/>
- </complexContent>
- </complexType>
-
-</schema> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
deleted file mode 100644
index efd6d11b8e..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.test;
-
-import static org.junit.Assert.assertEquals;
-
-
-import org.apache.tuscany.sca.artifact.xyz.XYZ;
-import org.apache.tuscany.sca.artifact.xyz.XYZModelResolver;
-import org.apache.tuscany.sca.artifact.xyz.XYZProcessor;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZFactoryImpl;
-import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZProcessor;
-import org.apache.tuscany.sca.imprt.xyz.DefaultImportExportXYZFactory;
-import org.apache.tuscany.sca.imprt.xyz.ExportXYZProcessor;
-import org.apache.tuscany.sca.imprt.xyz.ImportXYZProcessor;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.manager.WorkspaceManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class WorkspaceManagerTestCase {
-
- private WorkspaceManager workspaceManager;
-
- @Before
- public void init() {
- workspaceManager = WorkspaceManager.newInstance();
- addExtensions(workspaceManager);
- workspaceManager.start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- Workspace workspace = loadWorkspace(workspaceManager);
- assertEquals(1, workspace.getContributions().get(0).getDeployables().size());
- }
-
- private void addExtensions(WorkspaceManager workspaceManager) {
- try {
- System.out.println("Add extensions");
- ExtensionPointRegistry registry = workspaceManager.getRegistry();
-
- // get monitor
- UtilityExtensionPoint utilities =
- registry.getExtensionPoint(UtilityExtensionPoint.class);
- MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
- Monitor monitor = monitorFactory.createMonitor();
-
- // create validation schema
- // are schema required
- ValidationSchemaExtensionPoint schemas =
- registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
- schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("implementation-xyz.xsd").toString());
- schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("import-xyz.xsd").toString());
-
- // create model factories
- ModelFactoryExtensionPoint modelFactories =
- registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-
- modelFactories.addFactory(new ImplementationXYZFactoryImpl());
- modelFactories.addFactory(new DefaultImportExportXYZFactory());
-
- // Create URL artifact processors
- URLArtifactProcessorExtensionPoint urlProcessors =
- registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-
- urlProcessors.addArtifactProcessor(new XYZProcessor(modelFactories, monitor));
-
- // Create stax artifact processors
- StAXArtifactProcessorExtensionPoint artifactProcessors =
- registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
- artifactProcessors.addArtifactProcessor(new ImplementationXYZProcessor(modelFactories,
- monitor));
- artifactProcessors.addArtifactProcessor(new ImportXYZProcessor(modelFactories,
- monitor));
- artifactProcessors.addArtifactProcessor(new ExportXYZProcessor(modelFactories,
- monitor));
-
- // create model resolvers
- ModelResolverExtensionPoint modelResolvers =
- registry.getExtensionPoint(ModelResolverExtensionPoint.class);
-
- modelResolvers.addResolver(XYZ.class, XYZModelResolver.class);
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- private Workspace loadWorkspace(WorkspaceManager workspaceManager){
- try {
- System.out.println("Process contribution");
-
- Workspace workspace = workspaceManager.createWorkspace();
-
- Contribution contribution = workspaceManager.readContribution("contrib2", "./target/classes/contrib2");
- workspaceManager.addContributionToWorkspace(workspace, contribution);
-
- contribution = workspaceManager.readContribution("contrib1", "./target/classes/contrib1");
- workspaceManager.addContributionToWorkspace(workspace, contribution);
-
- workspaceManager.resolveWorkspace(workspace);
-
- return workspace;
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- return null;
- }
-
- @After
- public void end() {
- workspaceManager.stop();
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
index f8e4fb94a0..cf61597bb1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
@@ -176,7 +176,6 @@
<module>workspace</module>
<module>workspace-impl</module>
<module>workspace-xml</module>
- <module>workspace-manager</module>
<module>xsd</module>
<module>xsd-xml</module>
<module>tracing-aspectj</module>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/NOTICE
deleted file mode 100644
index ad2ba40961..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml
deleted file mode 100644
index 0dda1fd60d..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-workspace-manager</artifactId>
- <name>Apache Tuscany SCA Domain Workspace Manager</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-workspace</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-workspace-impl</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <configuration>
- <instructions>
- <Bundle-Version>${tuscany.version}</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.workspace</Bundle-SymbolicName>
- <Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.workspace*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java
deleted file mode 100644
index 0ea82f8e86..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.Workspace;
-import org.apache.tuscany.sca.workspace.manager.impl.WorkspaceManagerImpl;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * This workspace manager class provides an SPI for firing up the Tuscany runtime
- * and for providing access to the Tuscany ExtensionPointRegsitry. With a reference to the
- * registry you can add new extension points programmatically before starting the runtime.
- * Once the runtime is started you can read contributions, create a workspace, populate it
- * and then resolve it.
- *
- * A workspace is a collection of contributions. A workspace populated
- * with one or more contribution models can be resolved to ensure
- * that all referenced artifacts are located. When more than one contribution
- * model is present resolution takes into account the import and export relationships
- * between contributions.
- */
-public abstract class WorkspaceManager {
-
- /**
- * Get a new instance of the WorkspaceManager. Each call will create a
- * distinct instance.
- *
- * @return workspace manager
- */
- public static WorkspaceManager newInstance() throws ServiceRuntimeException{
- try {
- // replace with service discovery lookup?
- return new WorkspaceManagerImpl();
- } catch(Exception ex){
- throw new ServiceRuntimeException(ex);
- }
- }
-
- /**
- * 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 abstract 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 abstract void start() throws ServiceRuntimeException;
-
- /**
- * Remove any resources being held by the runtime
- */
- public abstract void stop() throws ServiceRuntimeException;
-
- /**
- * Create an empty workspace
- *
- * @return workspace
- */
- public abstract Workspace createWorkspace() throws ServiceRuntimeException;
-
- /**
- * Create a contribution model by reading from the specified location URL
- *
- * @param name the URI that's given to the contribution
- * @param location the URL of the contribution to be read
- */
- public abstract Contribution readContribution(String name, String location) throws ServiceRuntimeException;
-
- /**
- * Add a contribution to a workspace
- *
- * @param workspace the workspace to be extended
- * @param contribution the contribution to be added
- */
- public abstract void addContributionToWorkspace(Workspace workspace, Contribution contribution) throws ServiceRuntimeException;
-
- /**
- * Resolve all of the contributions in the workspace
- *
- * @param workspace
- */
- public abstract void resolveWorkspace(Workspace workspace) throws ServiceRuntimeException;
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java
deleted file mode 100644
index f95f74ab2c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.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;
-
-/**
- * This workspace manager class provides an SPI for firing up the Tuscany runtime
- * and for providing access to the Tuscany ExtensionPointRegsitry. With a reference to the
- * registry you can add new extension points programmatically before starting the runtime.
- * Once the runtime is started you can read contributions, create a workspace, populate it
- * and then resolve it.
- *
- * A workspace is a collection of contributions. A workspace populated
- * with one or more contribution models can be resolved to ensure
- * that all referenced artifacts are located. When more than one contribution
- * model is present resolution takes into account the import and export relationships
- * between contributions.
- */
-public class WorkspaceManagerImpl extends 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() throws ServiceRuntimeException{
- 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() throws ServiceRuntimeException {
- try {
- runtime.start();
- } catch(Exception ex) {
- throw new ServiceRuntimeException(ex);
- }
- }
-
- public void stop() throws ServiceRuntimeException{
- 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 readContribution(String name, String location) throws ServiceRuntimeException{
- try {
- Contribution returnContribution =
- contributionProcessor.read(null,
- URI.create(name),
- new File(location).toURI().toURL());
-
- analyzeProblems();
-
- return returnContribution;
-
- } catch (Exception ex) {
- throw new ServiceRuntimeException(ex);
- }
- }
-
- public void addContributionToWorkspace(Workspace workspace, Contribution contribution) throws ServiceRuntimeException{
- try {
-
- workspace.getContributions().add(contribution);
-
-
- } catch (Exception ex) {
- throw new ServiceRuntimeException(ex);
- }
- }
-
- public void resolveWorkspace(Workspace workspace) throws ServiceRuntimeException {
- try {
- // an algorithm to resolve contributions given their dependencies
- // need to look at the one from 2.x as this one expects contributions
- // to be 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);
- }
- }
-
- 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());
- }
- }
- }
- }
-
-}