Move node configuration to node-api

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774126 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 16 insertions, 332 deletions

diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
deleted file mode 100644
index 1d79062c0d..0000000000
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.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.node.configuration.xml;

-

-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

-

-import java.util.StringTokenizer;

-

-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.AssemblyFactory;

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.node.configuration.BindingConfiguration;

-import org.apache.tuscany.sca.node.configuration.ContributionConfiguration;

-import org.apache.tuscany.sca.node.configuration.DeploymentComposite;

-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;

-import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory;

-

-/**

- * Implements a StAX artifact processor for node implementations.

- *

- * @version $Rev: 750323 $ $Date: 2009-03-04 21:52:01 -0800 (Wed, 04 Mar 2009) $

- */

-public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implements

-    StAXArtifactProcessor<NodeConfiguration> {

-    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";

-    private static final QName NODE = new QName(SCA11_TUSCANY_NS, "node");

-    private static final QName CONTRIBUTION = new QName(SCA11_TUSCANY_NS, "contribution");

-    private static final QName BINDING = new QName(SCA11_TUSCANY_NS, "binding");

-    private static final QName DEPLOYMENT_COMPOSITE = new QName(SCA11_TUSCANY_NS, "deploymentComposite");

-

-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

-    private static final QName COMPOSITE = new QName(SCA11_NS, "composite");

-

-    private StAXArtifactProcessor processor;

-    private AssemblyFactory assemblyFactory;

-    private NodeConfigurationFactory nodeConfigurationFactory;

-

-    public NodeConfigurationProcessor(FactoryExtensionPoint modelFactories,

-                                      StAXArtifactProcessor processor,

-                                      Monitor monitor) {

-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

-        this.nodeConfigurationFactory = modelFactories.getFactory(NodeConfigurationFactory.class);

-        this.processor = processor;

-    }

-

-    public QName getArtifactType() {

-        // Returns the QName of the XML element processed by this processor

-        return NODE;

-    }

-

-    public Class<NodeConfiguration> getModelType() {

-        // Returns the type of model processed by this processor

-        return NodeConfiguration.class;

-    }

-

-    public NodeConfiguration read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-

-        NodeConfiguration node = null;

-        ContributionConfiguration contribution = null;

-        DeploymentComposite composite = null;

-

-        // Skip to end element

-        while (true) {

-            int event = reader.getEventType();

-            switch (event) {

-                case XMLStreamConstants.START_ELEMENT:

-                    QName name = reader.getName();

-                    if (NODE.equals(name)) {

-                        node = nodeConfigurationFactory.createNodeConfiguration();

-                        node.setURI(reader.getAttributeValue(null, "uri"));

-                        node.setDomainURI(reader.getAttributeValue(null, "domain"));

-                    } else if (CONTRIBUTION.equals(name)) {

-                        contribution = nodeConfigurationFactory.createContributionConfiguration();

-                        contribution.setURI(reader.getAttributeValue(null, "uri"));

-                        contribution.setLocation(reader.getAttributeValue(null, "location"));

-                        node.getContributions().add(contribution);

-                    } else if (BINDING.equals(name)) {

-                        BindingConfiguration binding = nodeConfigurationFactory.createBindingConfiguration();

-                        binding.setBindingType(getQName(reader, "name"));

-                        String baseURIs = reader.getAttributeValue(null, "baseURIs");

-                        if (baseURIs != null) {

-                            StringTokenizer tokenizer = new StringTokenizer(baseURIs);

-                            while (tokenizer.hasMoreTokens()) {

-                                binding.getBaseURIs().add(tokenizer.nextToken());

-                            }

-                        }

-                        node.getBindings().add(binding);

-                    } else if (DEPLOYMENT_COMPOSITE.equals(name)) {

-                        composite = nodeConfigurationFactory.createDeploymentComposite();

-                        composite.setLocation(reader.getAttributeValue(null, "location"));

-                        if (contribution != null) {

-                            contribution.getDeploymentComposites().add(composite);

-                        }

-                    } else if (COMPOSITE.equals(name)) {

-                        Object model = processor.read(reader);

-                        if (model instanceof Composite) {

-                            composite.setComposite((Composite)model);

-                        }

-                    }

-                    break;

-

-                case END_ELEMENT:

-                    name = reader.getName();

-                    if (NODE.equals(name)) {

-                        return node;

-                    } else if (CONTRIBUTION.equals(name)) {

-                        contribution = null;

-                    }

-            }

-            if (reader.hasNext()) {

-                reader.next();

-            } else {

-                break;

-            }

-        }

-

-        return node;

-    }

-

-    public void resolve(NodeConfiguration node, ModelResolver resolver) throws ContributionResolveException {

-    }

-

-    public void write(NodeConfiguration node, XMLStreamWriter writer) throws ContributionWriteException,

-        XMLStreamException {

-

-        writeStart(writer,

-                   NODE.getNamespaceURI(),

-                   NODE.getLocalPart(),

-                   new XAttr("uri", node.getURI()),

-                   new XAttr("domain", node.getDomainURI()));

-

-        for (ContributionConfiguration c : node.getContributions()) {

-            writeStart(writer,

-                       CONTRIBUTION.getNamespaceURI(),

-                       CONTRIBUTION.getLocalPart(),

-                       new XAttr("uri", c.getURI()),

-                       new XAttr("location", c.getLocation()));

-            writeEnd(writer);

-        }

-

-        for (BindingConfiguration b : node.getBindings()) {

-            StringBuffer uris = new StringBuffer();

-            for (String uri : b.getBaseURIs()) {

-                uris.append(uri).append(' ');

-            }

-            if (uris.length() > 0) {

-                uris.deleteCharAt(uris.length() - 1); // Remove the trailing space

-            } else {

-                uris = null;

-            }

-            writeStart(writer,

-                       BINDING.getNamespaceURI(),

-                       BINDING.getLocalPart(),

-                       new XAttr("name", b.getBindingType()),

-                       new XAttr("baseURIs", uris.toString()));

-            writeEnd(writer);

-        }

-

-        writeEnd(writer);

-    }

-}

diff --git a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
deleted file mode 100644
index e4d7925efe..0000000000
--- a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ /dev/null
@@ -1,46 +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.

--->

-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    uri="http://sample/nodes/TestNode1"

-    domain="http://domain1">

-

-    <!-- Configure the base URIs for a given binding -->

-    <!-- Each base URI is for a protocol supported by the binding -->

-    <binding name="sca:binding.ws" baseURIs="http://localhost:8080/ws https://localhost:8081/ws"/>

-    <binding name="tuscany:binding.rmi" baseURIs="rmi://localhost:8080/rmi"/>

-

-    <!-- Configure a list of contributions -->

-    <contribution uri="http://c1" location="file:///a.jar"/>

-    <contribution uri="http://c2" location="http://locahost/repo/b.jar">

-        <!-- The deployment composite is optional -->

-        <!-- The deployment composite can be defined inline or referenced using a URI -->

-        <!-- Can we have more than one deployment composites -->

-        <deploymentComposite>

-            <sca:composite>

-            </sca:composite>

-        </deploymentComposite>

-    </contribution>

-    <contribution uri="http://c3" location="http://locahost/repo/c.jar"/>

-        <deploymentComposite location="test/Test.composite">

-        </deploymentComposite>

-    </contribution>

-</node>
\ No newline at end of file
diff --git a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node2.xml b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node2.xml
deleted file mode 100644
index d8781f1b8c..0000000000
--- a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/node2.xml
+++ /dev/null
@@ -1,33 +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.

--->

-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    targetNamespace="http://sample/node"

-    name="TestNode2"

-    domain="http://domain1">

-

-    <binding name="sca:binding.ws" baseURIs="http://localhost:8080/ws https://localhost:8081/ws"/>

-    <binding name="tuscany:binding.rmi" baseURIs="rmi://localhost:8080/rmi"/>

-    <contribution uri="http://c1" location="file:///a.jar">

-        <deploymentComposite location="test/Test.composite"/>

-    </contribution>

-    <contribution uri="http://c4" location="http://locahost/repo/d.jar"/>

-</node>
\ No newline at end of file
diff --git a/java/sca/modules/node-api/META-INF/MANIFEST.MF b/java/sca/modules/node-api/META-INF/MANIFEST.MF
index 5d89c70a96..5e9e481abd 100644
--- a/java/sca/modules/node-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-api/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.node;uses:="org.oasisopen.sca";versi

- on="2.0.0"

+Export-Package: org.apache.tuscany.sca.node;version="2.0.0";uses:="org.oasisopen.sca",

+ org.apache.tuscany.sca.node.configuration;version="2.0.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA Node API

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

@@ -12,8 +12,9 @@ Bnd-LastModified: 1225397189093
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node API

-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",org.oasisopen.sca

- ;version="2.0.0"

+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",

+ org.apache.tuscany.sca.node.configuration;version="2.0.0",

+ org.oasisopen.sca;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.node.api

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
index 489a3fd2e3..489a3fd2e3 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
index 7d75cb32ac..0de5e0b473 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
@@ -21,8 +21,6 @@ package org.apache.tuscany.sca.node.configuration;
 

 import java.util.List;

 

-import org.apache.tuscany.sca.contribution.Contribution;

-

 /**

  * Configuration for an SCA contribution used by the SCA node

  */

@@ -52,18 +50,6 @@ public interface ContributionConfiguration {
     void setLocation(String location);

 

     /**

-     * Get the contribution

-     * @return

-     */

-    Contribution getContribution();

-

-    /**

-     * Set the contribution

-     * @param contribution

-     */

-    void setContribution(Contribution contribution);

-

-    /**

      * Get the list of deployment composites that are attached to the contribution

      * @return

      */

diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
index a14a4ac9eb..a14a4ac9eb 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
index 09bf3ee0ef..c322d7ed15 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
@@ -19,8 +19,6 @@
 

 package org.apache.tuscany.sca.node.configuration;

 

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

 

 /**

  * Configuration for a deployment composite

@@ -52,27 +50,15 @@ public interface DeploymentComposite {
     void setContent(String compositeXML);

 

     /**

-     * Get the composite

-     * @return

-     */

-    Composite getComposite();

-

-    /**

-     * Set the composite

-     * @param composite

-     */

-    void setComposite(Composite composite);

-

-    /**

-     * Get the contribution that this deployment composite is attached to

-     * @return

+     * Get the URI of the contribution that the deployment composite is attached to

+     * @return the URI of the contribution that the deployment composite is attached to

      */

-    Contribution getContribution();

+    String getContributionURI();

 

     /**

-     * Set the contribution that this deployment composite is attached to

-     * @param contribution

+     * Set the URI of the contribution that the deployment composite is attached to

+     * @param contributionURI

      */

-    void setContribution(Contribution contribution);

+    void setContributionURI(String contributionURI);

 

 }

diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
index f1eeb868ff..f1eeb868ff 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
index ca1afee923..ca1afee923 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
index eb5ac2915b..eb5ac2915b 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
index 1793a99cc1..d34fac866c 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
@@ -22,7 +22,6 @@ package org.apache.tuscany.sca.node.configuration.impl;
 import java.util.ArrayList;

 import java.util.List;

 

-import org.apache.tuscany.sca.contribution.Contribution;

 import org.apache.tuscany.sca.node.configuration.ContributionConfiguration;

 import org.apache.tuscany.sca.node.configuration.DeploymentComposite;

 

@@ -31,17 +30,9 @@ import org.apache.tuscany.sca.node.configuration.DeploymentComposite;
  */

 class ContributionConfigurationImpl implements ContributionConfiguration {

     private List<DeploymentComposite> deploymentComposites = new ArrayList<DeploymentComposite>();

-    private Contribution contribution;

     private String uri;

     private String location;

 

-    public Contribution getContribution() {

-        return contribution;

-    }

-

-    public void setContribution(Contribution contribution) {

-        this.contribution = contribution;

-    }

 

     /**

      * Get the URI of the contribution

diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
index 7113ad0d36..fabba4551e 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
@@ -19,8 +19,6 @@
 

 package org.apache.tuscany.sca.node.configuration.impl;

 

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

 import org.apache.tuscany.sca.node.configuration.DeploymentComposite;

 

 /**

@@ -29,8 +27,7 @@ import org.apache.tuscany.sca.node.configuration.DeploymentComposite;
 class DeploymentCompositeImpl implements DeploymentComposite {

     private String location;

     private String content;

-    private Composite composite;

-    private Contribution contribution;

+    private String contributionURI;

 

     public String getLocation() {

         return location;

@@ -48,20 +45,12 @@ class DeploymentCompositeImpl implements DeploymentComposite {
         this.content = content;

     }

 

-    public Composite getComposite() {

-        return composite;

+    public String getContributionURI() {

+        return contributionURI;

     }

 

-    public void setComposite(Composite composite) {

-        this.composite = composite;

-    }

-

-    public Contribution getContribution() {

-        return contribution;

-    }

-

-    public void setContribution(Contribution contribution) {

-        this.contribution = contribution;

+    public void setContributionURI(String contributionURI) {

+        this.contributionURI = contributionURI;

     }

 

 }

diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
index 96ca3e6199..96ca3e6199 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
diff --git a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
index 4f13959ced..4f13959ced 100644
--- a/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java