You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/17 02:17:47 UTC
svn commit: r519200 - in
/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader:
ComponentTypeHandler.java CompositeHandler.java
ConstrainingTypeHandler.java util/PrintUtil.java
Author: jsdelfino
Date: Fri Mar 16 18:17:46 2007
New Revision: 519200
URL: http://svn.apache.org/viewvc?view=rev&rev=519200
Log:
Added handling of callback elements + minor code cleanup
Modified:
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/util/PrintUtil.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java?view=diff&rev=519200&r1=519199&r2=519200
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java Fri Mar 16 18:17:46 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.assembly.reader;
import org.apache.tuscany.assembly.model.AssemblyFactory;
+import org.apache.tuscany.assembly.model.Callback;
import org.apache.tuscany.assembly.model.ComponentService;
import org.apache.tuscany.assembly.model.ComponentType;
import org.apache.tuscany.assembly.model.Property;
@@ -42,6 +43,7 @@
private Service service;
private Reference reference;
private Property property;
+ private Callback callback;
public ComponentTypeHandler(AssemblyFactory factory, XMLReader reader) {
super(factory, reader);
@@ -56,10 +58,12 @@
} else if ("service".equals(name)) {
service = factory.createService();
+ componentType.getServices().add(service);
service.setName(getString(attr, "name"));
} else if ("reference".equals(name)) {
reference = factory.createReference();
+ componentType.getReferences().add(reference);
reference.setName(getString(attr, "name"));
//TODO support multivalued attribute
@@ -71,25 +75,28 @@
} else if ("property".equals(name)) {
property = factory.createProperty();
readProperty(property, attr);
- }
+
+ } else if ("callback".equals(name)) {
+ callback = factory.createCallback();
+ if (reference != null) {
+ reference.setCallback(callback);
+ } else if (service != null) {
+ service.setCallback(callback);
+ }
+ }
}
}
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(String uri, String name, String qName) throws SAXException {
if (sca10.equals(uri)) {
-
- if ("service".equals(localName)) {
- componentType.getServices().add(service);
+ if ("service".equals(name)) {
service = null;
-
- } else if ("reference".equals(localName)) {
- componentType.getReferences().add(reference);
+ } else if ("reference".equals(name)) {
reference = null;
-
- } else if ("property".equals(localName)) {
- componentType.getProperties().add(property);
+ } else if ("property".equals(name)) {
property = null;
- }
+ } else if ("callback".equals(name))
+ callback = null;
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java?view=diff&rev=519200&r1=519199&r2=519200
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java Fri Mar 16 18:17:46 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.assembly.reader;
import org.apache.tuscany.assembly.model.AssemblyFactory;
+import org.apache.tuscany.assembly.model.Callback;
import org.apache.tuscany.assembly.model.Component;
import org.apache.tuscany.assembly.model.ComponentProperty;
import org.apache.tuscany.assembly.model.ComponentReference;
@@ -51,6 +52,7 @@
private CompositeService compositeService;
private CompositeReference compositeReference;
private Wire wire;
+ private Callback callback;
public CompositeHandler(AssemblyFactory factory, XMLReader reader) {
super(factory, reader);
@@ -69,9 +71,11 @@
} else if ("service".equals(name)) {
if (component != null) {
componentService = factory.createComponentService();
+ component.getServices().add(componentService);
componentService.setName(getString(attr, "name"));
} else {
compositeService = factory.createCompositeService();
+ composite.getServices().add(compositeService);
compositeService.setName(getString(attr, "name"));
ComponentService promoted = factory.createComponentService();
@@ -83,6 +87,7 @@
} else if ("reference".equals(name)) {
if (component != null) {
componentReference = factory.createComponentReference();
+ component.getReferences().add(componentReference);
componentReference.setName(getString(attr, "name"));
//TODO support multivalued attribute
@@ -93,6 +98,7 @@
} else {
compositeReference = factory.createCompositeReference();
+ composite.getReferences().add(compositeReference);
compositeReference.setName(getString(attr, "name"));
//TODO support multivalued attribute
@@ -105,19 +111,23 @@
} else if ("property".equals(name)) {
if (component != null) {
componentProperty = factory.createComponentProperty();
+ component.getProperties().add(componentProperty);
readProperty(componentProperty, attr);
} else {
property = factory.createProperty();
+ composite.getProperties().add(property);
readProperty(property, attr);
}
} else if ("component".equals(name)) {
component = factory.createComponent();
+ composite.getComponents().add(component);
component.setName(getString(attr, "name"));
component.setConstrainingType(getConstrainingType(attr));
} else if ("wire".equals(name)) {
wire = factory.createWire();
+ composite.getWires().add(wire);
ComponentReference source = factory.createComponentReference();
source.setUndefined(true);
@@ -128,51 +138,38 @@
target.setUndefined(true);
target.setName(getString(attr, "target"));
wire.setTarget(target);
- }
+
+ } else if ("callback".equals(name)) {
+ callback = factory.createCallback();
+ if (componentReference != null) {
+ componentReference.setCallback(callback);
+ } else if (compositeReference != null) {
+ compositeReference.setCallback(callback);
+ } else if (componentService != null) {
+ componentService.setCallback(callback);
+ } else if (compositeService != null) {
+ compositeService.setCallback(callback);
+ }
+ }
}
}
public void endElement(String uri, String name, String qname) throws SAXException {
- if ("composite".equals(name)) {
-
- } else if ("service".equals(name)) {
-
- if (component != null) {
- component.getServices().add(componentService);
- componentService = null;
- } else {
- composite.getServices().add(compositeService);
- compositeService = null;
- }
-
+ if ("service".equals(name)) {
+ componentService = null;
+ compositeService = null;
} else if ("reference".equals(name)) {
-
- if (component != null) {
- component.getReferences().add(componentReference);
- componentReference = null;
- } else {
- composite.getReferences().add(compositeReference);
- compositeReference = null;
- }
-
+ componentReference = null;
+ compositeReference = null;
} else if ("property".equals(name)) {
-
- if (component != null) {
- component.getProperties().add(componentProperty);
- componentProperty = null;
- } else {
- composite.getProperties().add(property);
- property = null;
- }
-
+ componentProperty = null;
+ property = null;
} else if ("component".equals(name)) {
- composite.getComponents().add(component);
component = null;
-
} else if ("wire".equals(name)) {
- composite.getWires().add(wire);
wire= null;
-
+ } else if ("callback".equals(name)) {
+ callback = null;
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java?view=diff&rev=519200&r1=519199&r2=519200
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java Fri Mar 16 18:17:46 2007
@@ -55,32 +55,31 @@
} else if ("service".equals(name)) {
abstractService = factory.createAbstractService();
+ constrainingType.getServices().add(abstractService);
abstractService.setName(getString(attr, "name"));
} else if ("reference".equals(name)) {
abstractReference = factory.createAbstractReference();
+ constrainingType.getReferences().add(abstractReference);
abstractReference.setName(getString(attr, "name"));
} else if ("property".equals(name)) {
abstractProperty = factory.createAbstractProperty();
+ constrainingType.getProperties().add(abstractProperty);
readAbstractProperty(abstractProperty, attr);
}
}
}
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(String uri, String name, String qName) throws SAXException {
if (sca10.equals(uri)) {
-
- if ("service".equals(localName)) {
- constrainingType.getServices().add(abstractService);
+ if ("service".equals(name)) {
abstractService = null;
- } else if ("reference".equals(localName)) {
- constrainingType.getReferences().add(abstractReference);
+ } else if ("reference".equals(name)) {
abstractReference = null;
- } else if ("property".equals(localName)) {
- constrainingType.getProperties().add(abstractProperty);
+ } else if ("property".equals(name)) {
abstractProperty = null;
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/util/PrintUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/util/PrintUtil.java?view=diff&rev=519200&r1=519199&r2=519200
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/util/PrintUtil.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/util/PrintUtil.java Fri Mar 16 18:17:46 2007
@@ -82,11 +82,11 @@
}
else {
Class<?> pvc = pv.getClass();
- if (pvc.isPrimitive() || pvc.getName().startsWith("java.") || pvc.getName().startsWith("javax.")) {
+ if (pvc.isPrimitive() || pvc.getName().startsWith("java.") || pvc.getName().startsWith("javax.") || pvc.isEnum()) {
if (!pd.getName().equals("class")) {
if (!(Boolean.FALSE.equals(pv))) {
indent(level+1);
- out.println(pd.getName() + "=" + pv);
+ out.println(pd.getName() + "=" + pv.toString());
}
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org