Rename packages to reflect the functions

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

25 files changed, 188 insertions, 47 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java
index 691d9da8d6..0a16a797c2 100644
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ComponentArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ComponentArtifact.java
index e2373cf1f5..96a1d6ad1c 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ComponentArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ComponentArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/CompositeArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/CompositeArtifact.java
index 0496f7c6cc..38285cac2a 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/CompositeArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/CompositeArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Constant.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Constant.java
index a2b2a93647..52e9e3e054 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Constant.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Constant.java
@@ -1,4 +1,4 @@
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 public final class Constant {
 
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/DashedWire.java
index 0169cf9936..4f9c741ab6 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/DashedWire.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Layer.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Layer.java
index c3a41140f8..fa2d44f89f 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Layer.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Layer.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Link.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Link.java
index 533c718595..a0cbee344c 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Link.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Link.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/NormalWire.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/NormalWire.java
index 69d7bb4a60..7611c004aa 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/NormalWire.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/NormalWire.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/PropertyArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/PropertyArtifact.java
index d9bad6e017..4b13c0de64 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/PropertyArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/PropertyArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ReferenceArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ReferenceArtifact.java
index 27a5a426ee..87ecba2af7 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ReferenceArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ReferenceArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ServiceArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ServiceArtifact.java
index f92b5cab08..d7c312f729 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/ServiceArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/ServiceArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Text.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Text.java
index 976ccb547f..ec4563254a 100644
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Text.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Text.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/WireArtifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/WireArtifact.java
index 4703abb80d..0b3e83b9c2 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/WireArtifact.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/artifacts/WireArtifact.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.artifacts;
+package org.apache.tuscany.sca.diagram.artifacts;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
index 822e427026..511bced0e8 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
@@ -17,28 +17,28 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.diagram;
+package org.apache.tuscany.sca.diagram.generator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.tuscany.sca.impl.artifacts.ComponentArtifact;
-import org.apache.tuscany.sca.impl.artifacts.CompositeArtifact;
-import org.apache.tuscany.sca.impl.artifacts.Constant;
-import org.apache.tuscany.sca.impl.artifacts.DashedWire;
-import org.apache.tuscany.sca.impl.artifacts.Layer;
-import org.apache.tuscany.sca.impl.artifacts.Link;
-import org.apache.tuscany.sca.impl.artifacts.NormalWire;
-import org.apache.tuscany.sca.impl.artifacts.PropertyArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ReferenceArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ServiceArtifact;
-import org.apache.tuscany.sca.impl.artifacts.Text;
-import org.apache.tuscany.sca.impl.artifacts.WireArtifact;
-import org.apache.tuscany.sca.impl.layout.ComponentEntity;
-import org.apache.tuscany.sca.impl.layout.CompositeEntity;
-import org.apache.tuscany.sca.impl.layout.Entity;
+import org.apache.tuscany.sca.diagram.artifacts.ComponentArtifact;
+import org.apache.tuscany.sca.diagram.artifacts.CompositeArtifact;
+import org.apache.tuscany.sca.diagram.artifacts.Constant;
+import org.apache.tuscany.sca.diagram.artifacts.DashedWire;
+import org.apache.tuscany.sca.diagram.artifacts.Layer;
+import org.apache.tuscany.sca.diagram.artifacts.Link;
+import org.apache.tuscany.sca.diagram.artifacts.NormalWire;
+import org.apache.tuscany.sca.diagram.artifacts.PropertyArtifact;
+import org.apache.tuscany.sca.diagram.artifacts.ReferenceArtifact;
+import org.apache.tuscany.sca.diagram.artifacts.ServiceArtifact;
+import org.apache.tuscany.sca.diagram.artifacts.Text;
+import org.apache.tuscany.sca.diagram.artifacts.WireArtifact;
+import org.apache.tuscany.sca.diagram.layout.ComponentEntity;
+import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
+import org.apache.tuscany.sca.diagram.layout.Entity;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/html/HTMLWrapper.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/html/HTMLWrapper.java
index 8feedd84b1..cf399bf23c 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/html/HTMLWrapper.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/html/HTMLWrapper.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.html;
+package org.apache.tuscany.sca.diagram.html;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/io/XMLReader.java
index b297421149..087c6370f8 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/io/XMLReader.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.io;
+package org.apache.tuscany.sca.diagram.io;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/io/XMLWriter.java
index 8963e09ec1..b1d87e1381 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/io/XMLWriter.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.io;
+package org.apache.tuscany.sca.diagram.io;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/ComponentEntity.java
index 9e12656b8a..626394fd44 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/ComponentEntity.java
@@ -17,11 +17,11 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 import java.util.HashMap;
 
-import org.apache.tuscany.sca.impl.artifacts.Constant;
+import org.apache.tuscany.sca.diagram.artifacts.Constant;
 
 /**
  * Represents an unit (a component including its references, services, properties
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/CompositeEntity.java
index 21746dfa28..258dcbcaa3 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/CompositeEntity.java
@@ -17,12 +17,12 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.tuscany.sca.impl.artifacts.Constant;
+import org.apache.tuscany.sca.diagram.artifacts.Constant;
 
 /**
  * Represents an unit (a component including its references, services, properties
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java
index f0f7215a24..582b8ed37b 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java
@@ -1,4 +1,4 @@
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java
index 387afd22c0..33ff1209cb 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilder.java
index 6143cede48..87b358479a 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilder.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 public class LayoutBuilder {
 
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/TuscanyCompositeEntityBuilder.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java
index 33f3d63a12..1a9b59e486 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/TuscanyCompositeEntityBuilder.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.impl.layout;
+package org.apache.tuscany.sca.diagram.layout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java
index 64b9ccdb92..c933ece35c 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.main;
+package org.apache.tuscany.sca.diagram.main;
 
 import java.io.File;
 import java.io.StringWriter;
@@ -27,12 +27,12 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.tuscany.sca.impl.diagram.DiagramGenerator;
-import org.apache.tuscany.sca.impl.html.HTMLWrapper;
-import org.apache.tuscany.sca.impl.io.XMLReader;
-import org.apache.tuscany.sca.impl.io.XMLWriter;
-import org.apache.tuscany.sca.impl.layout.CompositeEntity;
-import org.apache.tuscany.sca.impl.layout.EntityBuilder;
+import org.apache.tuscany.sca.diagram.generator.DiagramGenerator;
+import org.apache.tuscany.sca.diagram.html.HTMLWrapper;
+import org.apache.tuscany.sca.diagram.io.XMLReader;
+import org.apache.tuscany.sca.diagram.io.XMLWriter;
+import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
+import org.apache.tuscany.sca.diagram.layout.EntityBuilder;
 import org.w3c.dom.Document;
 
 public class Main {
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java
new file mode 100755
index 0000000000..992a47c1dd
--- /dev/null
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java
@@ -0,0 +1,141 @@
+package org.apache.tuscany.sca.diagram.layout;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.diagram.layout.ComponentEntity;
+import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
+import org.apache.tuscany.sca.diagram.layout.Entity;
+import org.apache.tuscany.sca.diagram.layout.LayoutBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+public class LayoutBuilderTestCase {
+
+    LayoutBuilder lb;
+    Entity[] ents;
+    Entity parent;
+    int[][] conns;
+
+    @Before
+    public void setUp() throws Exception {
+        parent = new CompositeEntity("composite");
+        parent.setX(200);
+        parent.setY(100);
+
+        ents = new Entity[5];
+        for (int i = 0; i < ents.length; i++) {
+            ents[i] = new ComponentEntity();
+            ents[i].setId(i);
+            ents[i].setParent(parent);
+        }
+
+    }
+
+    @Test
+    public void testPlaceEntities() throws Exception {
+        //setUp();
+        Assert.assertEquals(5, ents.length);
+        Assert.assertEquals(200, ents[0].getStartPosition());
+
+        conns = new int[5][5];
+        for (int i = 0; i < conns.length; i++) {
+            for (int j = 0; j < conns.length; j++) {
+                //int x = Math.getExponent(Math.random());
+                if (i == j - 1)
+                    conns[i][j] = 1;
+                else
+                    conns[i][j] = 0;
+            }
+        }
+
+        lb = new LayoutBuilder(ents, conns);
+
+        ents = lb.placeEntities();
+
+        Assert.assertEquals(5, ents.length);
+        Assert.assertEquals(0, lb.getStartEnt().getId());
+
+        Assert.assertEquals(0, ents[0].getLevel());
+        Assert.assertEquals(0, ents[1].getLevel());
+        Assert.assertEquals(0, ents[2].getLevel());
+        Assert.assertEquals(0, ents[3].getLevel());
+        Assert.assertEquals(0, ents[4].getLevel());
+
+        Assert.assertEquals(0, ents[0].getLane());
+        Assert.assertEquals(1, ents[1].getLane());
+        Assert.assertEquals(2, ents[2].getLane());
+        Assert.assertEquals(3, ents[3].getLane());
+        Assert.assertEquals(4, ents[4].getLane());
+
+    }
+
+    @Test
+    public void testPlaceEntities1() throws Exception {
+
+        conns = new int[5][5];
+        for (int i = 0; i < conns.length; i++) {
+            for (int j = 0; j < conns.length; j++) {
+                //int x = Math.getExponent(Math.random());
+                if (i == j - 1 || i == j - 4)
+                    conns[i][j] = 1;
+                else
+                    conns[i][j] = 0;
+            }
+        }
+        conns[3][4] = 0;
+
+        lb = new LayoutBuilder(ents, conns);
+
+        ents = lb.placeEntities();
+
+        Assert.assertEquals(5, ents.length);
+        Assert.assertEquals(0, lb.getStartEnt().getId());
+
+        Assert.assertEquals(0, ents[0].getLevel());
+        Assert.assertEquals(0, ents[1].getLevel());
+        Assert.assertEquals(0, ents[2].getLevel());
+        Assert.assertEquals(0, ents[3].getLevel());
+        Assert.assertEquals(1, ents[4].getLevel());
+
+        Assert.assertEquals(0, ents[0].getLane());
+        Assert.assertEquals(1, ents[1].getLane());
+        Assert.assertEquals(2, ents[2].getLane());
+        Assert.assertEquals(3, ents[3].getLane());
+        Assert.assertEquals(1, ents[4].getLane());
+
+    }
+
+    @Test
+    public void testPlaceEntities2() throws Exception {
+
+        conns = new int[5][5];
+        for (int i = 0; i < conns.length; i++) {
+            for (int j = 0; j < conns.length; j++) {
+                if (i * j > 2 && i * j <= 6)
+                    conns[i][j] = 1;
+                else
+                    conns[i][j] = 0;
+            }
+        }
+
+        lb = new LayoutBuilder(ents, conns);
+
+        ents = lb.placeEntities();
+
+        Assert.assertEquals(5, ents.length);
+        Assert.assertEquals(1, lb.getStartEnt().getId());
+
+        Assert.assertEquals(1, ents[0].getLevel());
+        Assert.assertEquals(0, ents[1].getLevel());
+        Assert.assertEquals(0, ents[2].getLevel());
+        Assert.assertEquals(0, ents[3].getLevel());
+        Assert.assertEquals(1, ents[4].getLevel());
+
+        Assert.assertEquals(0, ents[0].getLane());
+        Assert.assertEquals(0, ents[1].getLane());
+        Assert.assertEquals(2, ents[2].getLane());
+        Assert.assertEquals(1, ents[3].getLane());
+        Assert.assertEquals(1, ents[4].getLane());
+
+    }
+}