You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/03 13:44:40 UTC
svn commit: r514145 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/marshaller/java/ test/resources/marshall/
Author: meerajk
Date: Sat Mar 3 04:44:40 2007
New Revision: 514145
URL: http://svn.apache.org/viewvc?view=rev&rev=514145
Log:
normalized extension namespaces for Java and added test xml for changeset
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalReferenceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalServiceDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java?view=diff&rev=514145&r1=514144&r2=514145
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalComponentDefinitionMarshaller.java Sat Mar 3 04:44:40 2007
@@ -37,7 +37,7 @@
private static final String INSTANCE_FACTORY = "instanceFactory";
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/component/java/1.0-SNAPSHOT", "component");
+ private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "component");
/**
* Gets the qualified name of the XML fragment for the marshalled model object.
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalReferenceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalReferenceDefinitionMarshaller.java?view=diff&rev=514145&r1=514144&r2=514145
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalReferenceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalReferenceDefinitionMarshaller.java Sat Mar 3 04:44:40 2007
@@ -33,7 +33,7 @@
public class JavaPhysicalReferenceDefinitionMarshaller extends AbstractPhysicalReferenceDefinitionMarshaller<JavaPhysicalReferenceDefinition> {
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/reference/java/1.0-SNAPSHOT", "reference");
+ private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "reference");
/**
* Gets the qualified name of the XML fragment for the marshalled model object.
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalServiceDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalServiceDefinitionMarshaller.java?view=diff&rev=514145&r1=514144&r2=514145
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalServiceDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/java/JavaPhysicalServiceDefinitionMarshaller.java Sat Mar 3 04:44:40 2007
@@ -33,7 +33,7 @@
public class JavaPhysicalServiceDefinitionMarshaller extends AbstractPhysicalServiceDefinitionMarshaller<JavaPhysicalServiceDefinition> {
// QName for the root element
- private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/reference/java/1.0-SNAPSHOT", "service");
+ private static final QName QNAME = new QName("http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT", "service");
/**
* Gets the qualified name of the XML fragment for the marshalled model object.
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml?view=diff&rev=514145&r1=514144&r2=514145
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/marshall/javaChangeSet.xml Sat Mar 3 04:44:40 2007
@@ -1,19 +1,33 @@
-<changeSet>
+<core:changeSet xmlns:core="http://tuscany.apache.org/xmlns/marshaller/1.0-SNAPSHOT">
- <component>
-
- </component>
+ <!-- Component 1 -->
+ <java:component xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" componentId="cmp1">
+ <java:reference name="rf1">
+ <core:operation name="op2"/>
+ </java:reference>
+ <java:service name="sv1">
+ <core:operation name="op1"/>
+ </java:service>
+ </java:component>
- <component>
-
- </component>
+ <!-- Component 2 -->
+ <java:component xmlns:java="http://tuscany.apache.org/xmlns/marshaller/java/1.0-SNAPSHOT" componentId="cmp2">
+ <java:reference name="rf2">
+ <core:operation name="op1"/>
+ </java:reference>
+ <java:service name="sv2">
+ <core:operation name="op2"/>
+ </java:service>
+ </java:component>
- <wire>
-
- </wire>
+ <!-- Wire 1 -->
+ <core:wire sourceUri="cmp1#rf1" targetUri="cmp2#sv2">
+ <core:operation name="op2"/>
+ </core:wire>
- <wire>
-
- </wire>
+ <!-- Wire 2 -->
+ <core:wire sourceUri="cmp2#rf2" targetUri="cmp1#sv1">
+ <core:operation name="op1"/>
+ </core:wire>
-</changeSet>
\ No newline at end of file
+</core:changeSet>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org