tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r1172882 - in /tuscany/sca-java-2.x/trunk/modules/composite-diagram: ./ input/ output/ src/main/java/org/apache/tuscany/sca/diagram/artifacts/ src/main/java/org/apache/tuscany/sca/diagram/generator/ src/main/java/org/apache/tuscany/sca/diag...
Date Mon, 19 Sep 2011 22:55:56 GMT
Author: rfeng
Date: Mon Sep 19 22:55:55 2011
New Revision: 1172882

URL: http://svn.apache.org/viewvc?rev=1172882&view=rev
Log:
Add the support to generate the SCA diagram for a given node configuration

Added:
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/helloworld.composite
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/Calculator.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/MyValueComposite2.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite1.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite2.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite3.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_with_compositeService.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/store.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml   (contents, props changed)
      - copied, changed from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/supplychain.xml
Removed:
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/Calculator.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/MyValueComposite2.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite1.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite2.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite3.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_with_compositeService.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/store.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/supplychain.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/CalculatorTest_diagram.svg
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/Calculator_diagram.html
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/Calculator_diagram.svg
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/IdleTest_diagram.svg
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/MyValueComposite2_diagram.html
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/MyValueComposite2_diagram.svg
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/store_diagram.html
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/store_diagram.svg
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/supplychain_diagram.html
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/output/supplychain_diagram.svg
Modified:
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/pom.xml
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/resources/org/apache/tuscany/sca/diagram/artifacts/composite-diagram.css
    tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/pom.xml?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/pom.xml Mon Sep 19 22:55:55 2011
@@ -1,22 +1,11 @@
 <?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.    <groupId>org.apache.tuscany.sca</groupId>
--->
+<!-- * 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. <groupId>org.apache.tuscany.sca</groupId> -->
 <project>
 
     <modelVersion>4.0.0</modelVersion>
@@ -38,138 +27,98 @@
             <artifactId>commons-cli</artifactId>
             <version>1.2</version>
         </dependency>
-        
-        <!-- 
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-anim</artifactId>
-            <version>1.7</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-awt-util</artifactId>
+            <artifactId>batik-dom</artifactId>
             <version>1.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-css</artifactId>
+            <artifactId>batik-parser</artifactId>
             <version>1.7</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-ext</artifactId>
+            <artifactId>batik-svg-dom</artifactId>
             <version>1.7</version>
         </dependency>
- -->
 
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-dom</artifactId>
+            <artifactId>batik-transcoder</artifactId>
             <version>1.7</version>
+            <scope>compile</scope>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-parser</artifactId>
+            <artifactId>batik-codec</artifactId>
             <version>1.7</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-svg-dom</artifactId>
-            <version>1.7</version>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis-ext</artifactId>
+            <version>1.3.04</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-svggen</artifactId>
-            <version>1.7</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-util</artifactId>
-            <version>1.7</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-xml</artifactId>
-            <version>1.7</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-deployment</artifactId>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-codec</artifactId>
-            <version>1.7</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis-ext</artifactId>
-            <version>1.3.04</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>
 
 
     <build>
-        <defaultGoal>install</defaultGoal>
-        <directory>${basedir}/target</directory>
-        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-<!-- 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>${project.artifactId}-fetch-deps</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <stripVersion>true</stripVersion>
-                            <excludeTransitive>true</excludeTransitive>
-                            <excludeArtifactIds>junit</excludeArtifactIds>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
- -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/artifacts/Artifact.java Mon Sep 19 22:55:55 2011
@@ -117,4 +117,40 @@ public abstract class Artifact {
         return containerName;
     }
 
+    /**
+     * Parse the component/service|reference/binding names
+     * @param compoundName
+     * @return An array of names
+     */
+    public static String[] parseNames(String compoundName) {
+        String[] names = new String[] {"", "", ""};
+        if (compoundName != null) {
+            String[] parts = compoundName.split("/");
+            for (int i = 0; i < parts.length; i++) {
+                names[i] = parts[i];
+            }
+        }
+        return names;
+    }
+
+    public static boolean matches(String compoundName, String... parts) {
+        String names[] = parseNames(compoundName);
+        if (parts.length > names.length) {
+            return false;
+        }
+        for (int i = 0; i < parts.length; i++) {
+            if (parts[i].length() > 0 && names[i].length() > 0 && !names[i].equals(parts[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Artifact [containerName=").append(containerName).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
 }

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java Mon Sep 19 22:55:55 2011
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.tuscany.sca.diagram.artifacts.Artifact;
 import org.apache.tuscany.sca.diagram.artifacts.ComponentArtifact;
 import org.apache.tuscany.sca.diagram.artifacts.CompositeArtifact;
 import org.apache.tuscany.sca.diagram.artifacts.Constant;
@@ -154,7 +155,7 @@ public class DiagramGenerator {
             String compositeRef = entry.getKey();
             ArrayList<String> componentRef = entry.getValue();
 
-            ReferenceArtifact r1 = getRef(compositeRef);
+            ReferenceArtifact r1 = getRef(comp.getName() + "/" + compositeRef);
 
             for (String ref : componentRef) {
 
@@ -175,7 +176,7 @@ public class DiagramGenerator {
             String compositeSer = entry.getKey();
             String componentSer = entry.getValue();
 
-            ServiceArtifact s1 = getSer(compositeSer);
+            ServiceArtifact s1 = getSer(comp.getName() + "/" + compositeSer);
             ServiceArtifact s2 = getSer(componentSer);
 
             if (s1 != null && s2 != null) {
@@ -238,7 +239,7 @@ public class DiagramGenerator {
                 String ref = entry.getKey();
                 String ser = entry.getValue();
 
-                ReferenceArtifact r = getRef(ref);
+                ReferenceArtifact r = getRef(ent.getName() + "/" + ref);
                 ServiceArtifact s = getSer(ser);
 
                 if (r != null && s != null) {
@@ -292,7 +293,7 @@ public class DiagramGenerator {
     private ServiceArtifact getSer(String ser) {
 
         for (ServiceArtifact s : sers) {
-            if (s.getContainerName().equals(ser) || s.getName().equals(ser)) {
+            if (Artifact.matches(ser, s.getContainerName(), s.getName())) {
                 return s;
             }
         }
@@ -303,7 +304,7 @@ public class DiagramGenerator {
 
         for (ReferenceArtifact r : refs) {
 
-            if (r.getContainerName().equals(ref) || r.getName().equals(ref)) {
+            if (Artifact.matches(ref, r.getContainerName(), r.getName())) {
                 return r;
             }
         }

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/Entity.java Mon Sep 19 22:55:55 2011
@@ -284,5 +284,12 @@ public abstract class Entity {
         this.implementation = implementation;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Entity [id=").append(id).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
 
 }

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/EntityBuilder.java Mon Sep 19 22:55:55 2011
@@ -121,7 +121,7 @@ public class EntityBuilder {
                     if (service == null) {
                         composite.addToPromoteAService(compositeSer, serviceComp);
                     } else {
-                        composite.addToPromoteAService(compositeSer, service);
+                        composite.addToPromoteAService(compositeSer, serviceComp + "/" + service);
                     }
                 }
 
@@ -157,7 +157,7 @@ public class EntityBuilder {
                         if (reference == null) {
                             composite.addToPromoteAReference(compositeRef, referenceComp);
                         } else {
-                            composite.addToPromoteAReference(compositeRef, reference);
+                            composite.addToPromoteAReference(compositeRef, referenceComp + "/" + reference);
                         }
                     }
 
@@ -504,12 +504,12 @@ public class EntityBuilder {
 
         if (reference != null && service != null) {
 
-            ent.addToRefToSerMap(reference, service);
+            ent.addToRefToSerMap(reference, serviceComp + "/" + service);
             ent.addAnAdjacentEntity(serviceComp);
             addToConnectedEntities(referenceComp, serviceComp);
             addToConnectedEntities(serviceComp, referenceComp);
         } else if (reference == null && service != null) {
-            ent.addToRefToSerMap(referenceComp, service);
+            ent.addToRefToSerMap(referenceComp, serviceComp + "/" + service);
             ent.addAnAdjacentEntity(serviceComp);
             addToConnectedEntities(referenceComp, serviceComp);
             addToConnectedEntities(serviceComp, referenceComp);
@@ -708,13 +708,13 @@ public class EntityBuilder {
             }
         }
     }
-    
-    private String extractClassName(String classAttr){
-        if(classAttr==null) {
+
+    private String extractClassName(String classAttr) {
+        if (classAttr == null) {
             return "";
         } else {
             int index = classAttr.lastIndexOf('.');
-            return classAttr.substring(index+1);
+            return classAttr.substring(index + 1);
         }
     }
 

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/layout/TuscanyCompositeEntityBuilder.java Mon Sep 19 22:55:55 2011
@@ -30,10 +30,13 @@ import org.apache.tuscany.sca.assembly.C
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.Wire;
+import org.apache.tuscany.sca.diagram.artifacts.Artifact;
 
 public class TuscanyCompositeEntityBuilder {
 
@@ -61,15 +64,16 @@ public class TuscanyCompositeEntityBuild
 
         ComponentEntity[] comps = buildComponentEntities();
 
+        buildTargets(comps);
         buildWires(tuscanyComp.getWires(), comps);
 
         composite = new CompositeEntity(compositeName);
 
         setParent(comps);
 
-        System.out.println("ComponentEntity " + comps[0].getId());
+        // System.out.println("ComponentEntity " + comps[0].getId());
         int[][] conns = buildConnectionMatrix(comps);
-        System.out.println("ComponentEntity " + conns[0][0]);
+        // System.out.println("ComponentEntity " + conns[0][0]);
 
         composite.setComponentList(comps);
         composite.setConnections(conns);
@@ -77,7 +81,7 @@ public class TuscanyCompositeEntityBuild
         LayoutBuilder buildLayout = new LayoutBuilder(comps, conns);
         buildLayout.placeEntities();
 
-        System.out.println("conns " + conns[0][0]);
+        // System.out.println("conns " + conns[0][0]);
 
         buildCompositeService();
         buildCompositeReference();
@@ -173,20 +177,24 @@ public class TuscanyCompositeEntityBuild
     }
 
     private String extractComp(ComponentEntity[] elts, String str, boolean isReference) {
-
+        String[] names = Artifact.parseNames(str);
         if (isReference) {
             for (ComponentEntity elt : elts) {
-                for (String ref : elt.getReferences()) {
-                    if (ref.equals(str)) {
-                        return elt.getName();
+                if (elt.getName().equals(names[0])) {
+                    for (String ref : elt.getReferences()) {
+                        if (ref.equals(names[1])) {
+                            return elt.getName();
+                        }
                     }
                 }
             }
         } else {
             for (ComponentEntity elt : elts) {
-                for (String ser : elt.getServices()) {
-                    if (ser.equals(str)) {
-                        return elt.getName();
+                if (elt.getName().equals(names[0])) {
+                    for (String ser : elt.getServices()) {
+                        if (ser.equals(names[1])) {
+                            return elt.getName();
+                        }
                     }
                 }
             }
@@ -233,6 +241,22 @@ public class TuscanyCompositeEntityBuild
 
     }
 
+    private void buildTargets(ComponentEntity[] components) {
+
+        for (Component c : tuscanyComp.getComponents()) {
+            ComponentEntity sourceComponent = findEntity(components, c.getName());
+            for (ComponentReference ref : c.getReferences()) {
+                for (EndpointReference epr : ref.getEndpointReferences()) {
+                    Endpoint ep = epr.getTargetEndpoint();
+                    if (ep != null && ep.getComponent() != null && ep.getService() != null) {
+                        createConnection(sourceComponent, ref.getName(), ep.getComponent().getName(), ep.getService()
+                            .getName());
+                    }
+                }
+            }
+        }
+    }
+
     private void buildWires(List<Wire> wires, ComponentEntity[] elts) {
 
         for (int i = 0; i < wires.size(); i++) {
@@ -281,12 +305,12 @@ public class TuscanyCompositeEntityBuild
 
         if (reference != null && service != null) {
 
-            ent.addToRefToSerMap(reference, service);
+            ent.addToRefToSerMap(reference, serviceComp + "/" + service);
             ent.addAnAdjacentEntity(serviceComp);
             addToConnectedEntities(referenceComp, serviceComp);
             addToConnectedEntities(serviceComp, referenceComp);
         } else if (reference == null && service != null) {
-            ent.addToRefToSerMap(referenceComp, service);
+            ent.addToRefToSerMap(referenceComp, serviceComp + "/" + service);
             ent.addAnAdjacentEntity(serviceComp);
             addToConnectedEntities(referenceComp, serviceComp);
             addToConnectedEntities(serviceComp, referenceComp);
@@ -319,7 +343,7 @@ public class TuscanyCompositeEntityBuild
     }
 
     private void addToConnectedEntities(String ent1, String ent2) {
-        System.err.println(ent1 + " : " + ent2);
+        // System.err.println(ent1 + " : " + ent2);
         ArrayList<String> list;
         if (connectedEntities.containsKey(ent1)) {
             list = connectedEntities.get(ent1);

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/java/org/apache/tuscany/sca/diagram/main/Main.java Mon Sep 19 22:55:55 2011
@@ -29,6 +29,7 @@ import java.io.StringWriter;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -51,6 +52,10 @@ import org.apache.tuscany.sca.diagram.ge
 import org.apache.tuscany.sca.diagram.html.HTMLWrapper;
 import org.apache.tuscany.sca.diagram.layout.CompositeEntity;
 import org.apache.tuscany.sca.diagram.layout.EntityBuilder;
+import org.apache.tuscany.sca.diagram.layout.TuscanyCompositeEntityBuilder;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
+import org.apache.tuscany.sca.node.extensibility.NodeExtension;
 import org.w3c.dom.Document;
 
 public class Main {
@@ -183,22 +188,29 @@ public class Main {
     }
 
     private static String extractSvg(Document svg) throws Exception {
-
-        // Set up the output transformer
-        TransformerFactory transfac = TransformerFactory.newInstance();
-        Transformer trans = transfac.newTransformer();
-
         // Print the DOM node
 
         StringWriter sw = new StringWriter();
         StreamResult result = new StreamResult(sw);
-        DOMSource source = new DOMSource(svg);
-        trans.transform(source, result);
+
+        transform(svg, result);
         String svgString = sw.toString();
 
         return svgString;
     }
 
+    private static void transform(Document svg, StreamResult result) throws Exception {
+        // Set up the output transformer
+        TransformerFactory transfac = TransformerFactory.newInstance();
+
+        Transformer trans = transfac.newTransformer();
+        trans.setOutputProperty(OutputKeys.INDENT, "yes");
+        trans.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+
+        DOMSource source = new DOMSource(svg);
+        trans.transform(source, result);
+    }
+
     public static void svgToJPEG(File svg, File jpeg) throws IOException, TranscoderException {
         // Create the transcoder input.
         TranscoderInput input = new TranscoderInput(svg.toURI().toString());
@@ -280,4 +292,34 @@ public class Main {
         png.close();
     }
 
+    /**
+     * Generate the SVG diagram from 
+     * @param configuration
+     * @param classLoader
+     * @return The XML string for the SVG
+     * @throws Exception
+     */
+    public static String generateDiagram(NodeConfiguration configuration, ClassLoader classLoader, String baseURL)
+        throws Exception {
+        ClassLoader currentTCCL = null;
+        if (classLoader != null) {
+            currentTCCL = Thread.currentThread().getContextClassLoader();
+            Thread.currentThread().setContextClassLoader(classLoader);
+        }
+
+        try {
+            NodeFactory factory = NodeFactory.getInstance();
+            NodeExtension node = factory.loadNode(configuration);
+            TuscanyCompositeEntityBuilder builder = new TuscanyCompositeEntityBuilder(node.getDomainComposite());
+            CompositeEntity compositeEntity = builder.buildCompositeEntity();
+            DiagramGenerator generator = new DiagramGenerator(compositeEntity, false, baseURL);
+            Document doc = generator.buildSVGDocument();
+            return extractSvg(doc);
+        } finally {
+            if (currentTCCL != null) {
+                Thread.currentThread().setContextClassLoader(currentTCCL);
+            }
+        }
+    }
+
 }

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/resources/org/apache/tuscany/sca/diagram/artifacts/composite-diagram.css
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/resources/org/apache/tuscany/sca/diagram/artifacts/composite-diagram.css?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/resources/org/apache/tuscany/sca/diagram/artifacts/composite-diagram.css (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/main/resources/org/apache/tuscany/sca/diagram/artifacts/composite-diagram.css Mon Sep 19 22:55:55 2011
@@ -60,4 +60,4 @@ polyline.normalWire {
 
 polyline.dashedWire {
 	stroke-dasharray: "3 3";
-}
\ No newline at end of file
+}

Modified: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java?rev=1172882&r1=1172881&r2=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java Mon Sep 19 22:55:55 2011
@@ -19,15 +19,19 @@
 package org.apache.tuscany.sca.diagram.layout;
 
 import java.io.File;
+import java.io.FileWriter;
 
 import org.apache.tuscany.sca.diagram.main.Main;
+import org.apache.tuscany.sca.diagram.test.HelloWorld;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.junit.Test;
 
 public class DiagramGeneratorTestCase {
 
     @Test
-    public final void test() throws Exception {
-        for (File xml : new File("input").listFiles()) {
+    public final void testFiles() throws Exception {
+        for (File xml : new File("src/test/resources/input").listFiles()) {
             if (xml.getName().endsWith(".xml")) {
                 System.out.println(xml);
                 Main.generate(new File("target"), null, true, false, false, xml.toString());
@@ -35,4 +39,17 @@ public class DiagramGeneratorTestCase {
         }
     }
 
+    @Test
+    public final void testNode() throws Exception {
+        NodeConfiguration config = NodeFactory.getInstance().createNodeConfiguration();
+        config.addContribution(new File("target/test-classes/contribution").toURI().toURL());
+
+        String svg = Main.generateDiagram(config, HelloWorld.class.getClassLoader(), null);
+        
+        System.out.println(svg);
+        FileWriter fw = new FileWriter("target/node.svg");
+        fw.write(svg);
+        fw.close();
+    }
+
 }

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java Mon Sep 19 22:55:55 2011
@@ -1,5 +1,4 @@
-<?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
@@ -16,16 +15,23 @@
  * 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"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="IdleTest">
+ */
 
-   <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
+package org.apache.tuscany.sca.diagram.test;
 
-    
+import org.oasisopen.sca.annotation.Remotable;
 
-</composite>
\ No newline at end of file
+/**
+ * HelloWorld interface
+ */
+@Remotable
+public interface HelloWorld {
+    String hello(String name);
+
+    Message echo(Message msg);
+
+    public class Message {
+        public String name;
+        public String message;
+    }
+}

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java Mon Sep 19 22:55:55 2011
@@ -1,5 +1,4 @@
-<?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
@@ -16,16 +15,25 @@
  * 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"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="IdleTest">
+ */
 
-   <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
+package org.apache.tuscany.sca.diagram.test;
 
-    
+import org.oasisopen.sca.annotation.AllowsPassByReference;
 
-</composite>
\ No newline at end of file
+/**
+ * HelloWorld2Impl
+ */
+@AllowsPassByReference
+public class HelloWorld2Impl implements HelloWorld {
+
+    public String hello(String name) {
+        String msg = "Hello " + name;
+        return msg;
+    }
+
+    @Override
+    public Message echo(Message msg) {
+        return msg;
+    }
+}

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java Mon Sep 19 22:55:55 2011
@@ -16,23 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.diagram.layout;
 
-import java.io.File;
+package org.apache.tuscany.sca.diagram.test;
 
-import org.apache.tuscany.sca.diagram.main.Main;
-import org.junit.Test;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Reference;
 
-public class DiagramGeneratorTestCase {
+/**
+ * HelloWorldImpl
+ */
+@AllowsPassByReference
+public class HelloWorldImpl implements HelloWorld {
+    @Reference
+    private HelloWorld delegate;
 
-    @Test
-    public final void test() throws Exception {
-        for (File xml : new File("input").listFiles()) {
-            if (xml.getName().endsWith(".xml")) {
-                System.out.println(xml);
-                Main.generate(new File("target"), null, true, false, false, xml.toString());
-            }
-        }
+    public String hello(String name) {
+        String msg = delegate.hello(name);
+        return msg;
     }
 
+    @Override
+    public Message echo(Message msg) {
+        return delegate.echo(msg);
+    }
 }

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/helloworld.composite (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/helloworld.composite?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/helloworld.composite&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/contribution/helloworld.composite Mon Sep 19 22:55:55 2011
@@ -17,15 +17,18 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
-           name="IdleTest">
+           name="HelloWorld">
 
-   <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
+    <component name="HelloComponent">
+		<implementation.java class="org.apache.tuscany.sca.diagram.test.HelloWorldImpl"/>
+        <reference name="delegate" target="Hello2Component" />
     </component>
 
-    
+    <component name="Hello2Component">
+        <implementation.java class="org.apache.tuscany.sca.diagram.test.HelloWorld2Impl"/>
+    </component>
 
 </composite>
\ No newline at end of file

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/Calculator.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/Calculator.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/Calculator.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/MyValueComposite2.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/MyValueComposite2.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/MyValueComposite2.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite1.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite1.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite1.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	targetNamespace="http://supplychain"
 	xmlns:sp="http://supplychain"
 	name="supplychain">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite1.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite2.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite2.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite2.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
 		targetNamespace="http://store"
 		name="store">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite2.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite3.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite3.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite3.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="CalculatorTest">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite3.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_idle.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="IdleTest">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_idle.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_with_compositeService.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/composite_with_compositeService.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/composite_with_compositeService.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/store.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/store.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/store.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
 		targetNamespace="http://store"
 		name="store">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/store.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml (from r1172881, tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/supplychain.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml?p2=tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml&p1=tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/supplychain.xml&r1=1172881&r2=1172882&rev=1172882&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/composite-diagram/input/supplychain.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml Mon Sep 19 22:55:55 2011
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	targetNamespace="http://supplychain"
 	xmlns:sp="http://supplychain"
 	name="supplychain">

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/supplychain.xml
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message