Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A2E84C3C for ; Sun, 3 Jul 2011 08:11:57 +0000 (UTC) Received: (qmail 72378 invoked by uid 500); 3 Jul 2011 08:11:57 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 72306 invoked by uid 500); 3 Jul 2011 08:11:49 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 72261 invoked by uid 99); 3 Jul 2011 08:11:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jul 2011 08:11:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jul 2011 08:11:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C658E23889EC for ; Sun, 3 Jul 2011 08:11:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142395 - in /tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik: ./ input/ output/ src/main/java/org/apache/tuscany/sca/impl/diagram/ src/main/java/org/apache/tuscany/sca/impl/layout/ Date: Sun, 03 Jul 2011 08:11:18 -0000 To: commits@tuscany.apache.org From: nirmal070125@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110703081118.C658E23889EC@eris.apache.org> Author: nirmal070125 Date: Sun Jul 3 08:11:18 2011 New Revision: 1142395 URL: http://svn.apache.org/viewvc?rev=1142395&view=rev Log: add support to wire element Added: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg (with props) Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite1.xml tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite3.xml tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/pom.xml tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite1.xml URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite1.xml?rev=1142395&r1=1142394&r2=1142395&view=diff ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite1.xml (original) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite1.xml Sun Jul 3 08:11:18 2011 @@ -39,7 +39,9 @@ - + + + \ No newline at end of file Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite3.xml URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite3.xml?rev=1142395&r1=1142394&r2=1142395&view=diff ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite3.xml (original) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/input/composite3.xml Sun Jul 3 08:11:18 2011 @@ -44,7 +44,7 @@ - + \ No newline at end of file Added: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg?rev=1142395&view=auto ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg (added) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg Sun Jul 3 08:11:18 2011 @@ -0,0 +1 @@ + \ No newline at end of file Propchange: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/output/CalculatorTest_diagram.svg ------------------------------------------------------------------------------ svn:executable = * Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/pom.xml URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/pom.xml?rev=1142395&r1=1142394&r2=1142395&view=diff ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/pom.xml (original) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/pom.xml Sun Jul 3 08:11:18 2011 @@ -103,7 +103,12 @@ tuscany-base-runtime 2.0-SNAPSHOT - + + + org.apache.ws.commons.schema + XmlSchema + 1.4.3 + Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java?rev=1142395&r1=1142394&r2=1142395&view=diff ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java (original) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java Sun Jul 3 08:11:18 2011 @@ -170,7 +170,7 @@ public class DiagramGenerator { Entry entry = (Entry) it.next(); String ref = (String)entry.getKey(); String ser = (String)entry.getValue(); - + System.out.println("---------"+ref); int idx= refs.indexOf(ref); System.out.println("---------"+sers.get(idx)); sers.remove(idx); @@ -189,7 +189,7 @@ public class DiagramGenerator { if(s1.equals(s) || s.equals(ent.getComponentName())){ System.err.println("|||||||| "+ sers.size()+ " ||| " + refs.size()+"|| "+orderedRefs.length); if(orderedRefs[ent.getLevel()] == null){ -// System.err.println("XXXXX "+ sers.get(1)+ " ::::::: "+refs.get(1)); + System.err.println("XXXXX "+ sers.get(1)+ " ::::::: "+refs.get(1)); // System.err.println("XXXXX "+ sers.get(2)+ " ::::::: "+refs.get(2)); // System.err.println("XXXXX "+ sers.get(3)+ " ::::::: "+refs.get(3)); System.err.println("XXXXX "+ refs.get(sers.indexOf(s))+" ::: "+ent.getLevel()+" ::: "+ent.getComponentName()); Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java?rev=1142395&r1=1142394&r2=1142395&view=diff ============================================================================== --- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java (original) +++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java Sun Jul 3 08:11:18 2011 @@ -39,6 +39,7 @@ public class EntityBuilder { private int totalHeight=0; private Entity startEnt = null; private String compositeName; + Entity[] elts = null; /** * Constructor which initiates the DOM document @@ -76,7 +77,7 @@ public class EntityBuilder { * @return */ public Entity[] buildEntities(){ - Entity[] elts = null; + //get the root element Element docEle = dom.getDocumentElement(); compositeName = docEle.getAttribute("name"); @@ -99,6 +100,44 @@ public class EntityBuilder { elts[i].propertyLength(); } } + //sec. 5.4 in the spec + nl = docEle.getElementsByTagName("wire"); + System.out.println("^^^^^^^^^ "+nl.getLength()); + if(nl != null && nl.getLength() > 0 ) { + for(int i = 0 ; i < nl.getLength();i++) { + Element elt = (Element)nl.item(i); + String source = elt.getAttribute("source"); + String target = elt.getAttribute("target"); + String service, serviceComp, reference, referenceComp; + + System.out.println("^^^^^^^^^ "+source+" ::: "+target); + if(target.contains("/")){ + String[] arr = target.split("/"); + serviceComp = arr[0]; + service = arr[1]; + } + else{ + serviceComp = target; + service = null; + } + + if(source.contains("/")){ + String[] arr = source.split("/"); + referenceComp = arr[0]; + reference = arr[1]; + } + else{ + referenceComp = source; + reference = null; + } + + Entity e = findEntity(referenceComp); + System.out.println("^^^^^^^^^ "+e.getComponentName()); + if(e != null){ + createConnection(e, reference, serviceComp, service); + } + } + } positionEntities(elts); @@ -108,6 +147,78 @@ public class EntityBuilder { return elts; } + + private Entity findEntity(String componentName) { + + for(Entity e: elts){ + if(e.getComponentName().equals(componentName)){ + return e; + } + } + return null; + } + + private void setReferences(Element nVal, Entity ent) { + + NodeList nl = nVal.getElementsByTagName("reference"); + if(nl != null && nl.getLength() > 0 ) { + for(int i = 0 ; i < nl.getLength();i++) { + Element elt = (Element)nl.item(i); + String target = elt.getAttribute("target"); + String ref = elt.getAttribute("name"); + if(target.contains("/")){ + String[] arr = target.split("/"); + createConnection(ent, ref, arr[0], arr[1]); +// ent.addToRefToSerMap(ref, arr[1]); +// ent.addAnAdjacentEntity(arr[0]); +// addToConnectedEntities(ent.getComponentName(), arr[0]); +// addToConnectedEntities(arr[0], ent.getComponentName()); + } + else if(!target.equals("")){ + createConnection(ent, ref, target, null); +// ent.addToRefToSerMap(ref, target); +// ent.addAnAdjacentEntity(target); +// addToConnectedEntities(ent.getComponentName(), target); +// addToConnectedEntities(target, ent.getComponentName()); + } + + ent.addAReference(ref); + + } + } + } + + private void createConnection(Entity ent, String reference, + String serviceComp, String service) { + + String referenceComp = ent.getComponentName(); + + if(reference != null && service != null){ + + ent.addToRefToSerMap(reference, service); + ent.addAnAdjacentEntity(serviceComp); + addToConnectedEntities(referenceComp, serviceComp); + addToConnectedEntities(serviceComp, referenceComp); + } + else if(reference == null && service != null){ + ent.addToRefToSerMap(referenceComp, service); + ent.addAnAdjacentEntity(serviceComp); + addToConnectedEntities(referenceComp, serviceComp); + addToConnectedEntities(serviceComp, referenceComp); + } + else if(reference != null && service == null){ + ent.addToRefToSerMap(reference, serviceComp); + ent.addAnAdjacentEntity(serviceComp); + addToConnectedEntities(referenceComp, serviceComp); + addToConnectedEntities(serviceComp, referenceComp); + } + else{ + ent.addToRefToSerMap(referenceComp, serviceComp); + ent.addAnAdjacentEntity(serviceComp); + addToConnectedEntities(referenceComp, serviceComp); + addToConnectedEntities(serviceComp, referenceComp); + } + } private void calculateProperties(Entity[] elts) { int level=0, lane=0; @@ -224,33 +335,7 @@ public class EntityBuilder { return str.split("/"); } - private void setReferences(Element nVal, Entity ent) { - - NodeList nl = nVal.getElementsByTagName("reference"); - if(nl != null && nl.getLength() > 0 ) { - for(int i = 0 ; i < nl.getLength();i++) { - Element elt = (Element)nl.item(i); - String target = elt.getAttribute("target"); - String ref = elt.getAttribute("name"); - if(target.contains("/")){ - ent.addToRefToSerMap(ref, target.split("/")[1]); - ent.addAnAdjacentEntity(target.split("/")[0]); - addToConnectedEntities(ent.getComponentName(), target.split("/")[0]); - addToConnectedEntities(target.split("/")[0], ent.getComponentName()); - } - else if(!target.equals("")){ - - ent.addToRefToSerMap(ref, target); - ent.addAnAdjacentEntity(target); - addToConnectedEntities(ent.getComponentName(), target); - addToConnectedEntities(target, ent.getComponentName()); - } - - ent.addAReference(ref); - - } - } - } + private void addToConnectedEntities(String ent1, String ent2) { System.err.println(ent1+" : "+ent2);