Start to fix the MANIFEST.MF and rename split packages

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

7 files changed, 14 insertions, 7 deletions

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
index c38c59f0ba..9a10cbd306 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
@@ -17,7 +17,7 @@
  * under the License.    

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index 39f60c4a1d..761e9d25a7 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
@@ -17,13 +17,16 @@
  * under the License.    

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import java.net.URI;

 import java.util.HashMap;

 import java.util.Map;

 

 import org.apache.tuscany.sca.management.ConfigAttributes;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.apache.tuscany.sca.node.impl.NodeFactoryImpl;

 

 public class DomainNode {

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
index aaf1c6ca5e..2d8d15342a 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
@@ -17,7 +17,7 @@
  * under the License.

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import java.io.File;

 import java.util.ArrayList;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
index 4ca8f180bb..1d31a5467f 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
@@ -17,10 +17,11 @@
  * under the License.

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import static org.junit.Assert.assertEquals;

 

+import org.apache.tuscany.sca.domain.node.DomainNode;

 import org.junit.Test;

 

 /**

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
index 95e470bb28..20d7470a66 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
@@ -17,13 +17,14 @@
  * under the License.

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 import itest.nodes.Helloworld;

 import static org.junit.Assert.fail;

 

+import org.apache.tuscany.sca.domain.node.DomainNode;

 import org.junit.After;

 import org.junit.Test;

 import org.oasisopen.sca.SCARuntimeException;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
index d14dfd4a02..a5c829b87f 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
@@ -17,13 +17,14 @@
  * under the License.

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 import static org.junit.Assert.fail;

 import itest.nodes.Helloworld;

 

+import org.apache.tuscany.sca.domain.node.DomainNode;

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
index db2e5590a1..52093129a8 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
@@ -17,13 +17,14 @@
  * under the License.

  */

 

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

+package org.apache.tuscany.sca.domain.node;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 import static org.junit.Assert.fail;

 import itest.nodes.Helloworld;

 

+import org.apache.tuscany.sca.domain.node.DomainNode;

 import org.junit.After;

 import org.junit.Test;

 import org.oasisopen.sca.client.SCAClient;