Remove the dependency on NodeImpl and add the service registration

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

3 files changed, 19 insertions, 4 deletions

diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
index 6aace875b5..8180ac6465 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node.impl;
+package org.apache.tuscany.sca.deployment.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
index 5449230bc9..f3462ad1da 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
@@ -78,14 +78,12 @@ import org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint;
 import org.apache.tuscany.sca.deployment.Deployer;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.impl.Contributions;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
  * 
  */
 public class DeployerImpl implements Deployer {
-    protected static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
+    protected static final Logger logger = Logger.getLogger(DeployerImpl.class.getName());
 
     protected boolean inited;
     protected boolean schemaValidationEnabled;
diff --git a/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer b/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
new file mode 100644
index 0000000000..9ba95bc94b
--- /dev/null
+++ b/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
@@ -0,0 +1,17 @@
+# 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.

+org.apache.tuscany.sca.deployment.impl.DeployerImpl