You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/09 19:47:58 UTC
svn commit: r526852 [2/2] - in /incubator/tuscany/java/sca/modules: ./
implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/
implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/
implementati...
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicConstructorTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicConstructorTestCase.java Mon Apr 9 10:47:45 2007
@@ -63,7 +63,7 @@
prop.setName("foo");
type.getProperties().add(prop);
// Hack to add a property member
- JavaElement element = new JavaElement("foo", String.class);
+ JavaElement element = new JavaElement("foo", String.class, null);
type.getPropertyMembers().put("foo", element);
visitEnd(Foo1.class, type);
assertNotNull(type.getConstructorDefinition().getConstructor());
@@ -78,7 +78,7 @@
org.apache.tuscany.assembly.Reference ref = factory.createReference();
ref.setName("foo");
type.getReferences().add(ref);
- type.getReferenceMembers().put("foo", new JavaElement("foo", String.class));
+ type.getReferenceMembers().put("foo", new JavaElement("foo", String.class, null));
visitEnd(Foo1.class, type);
assertNotNull(type.getConstructorDefinition().getConstructor());
assertEquals("foo", type.getConstructorDefinition().getParameters()[0].getName());
@@ -95,12 +95,12 @@
prop.setName("foo");
type.getProperties().add(prop);
// Hack to add a property member
- JavaElement element = new JavaElement("foo", String.class);
+ JavaElement element = new JavaElement("foo", String.class, null);
type.getPropertyMembers().put("foo", element);
org.apache.tuscany.assembly.Reference ref = ModelHelper.createReference("ref", Foo1.class);
type.getReferences().add(ref);
- type.getReferenceMembers().put("ref", new JavaElement("ref", Foo1.class));
+ type.getReferenceMembers().put("ref", new JavaElement("ref", Foo1.class, null));
visitEnd(Foo2.class, type);
assertNotNull(type.getConstructorDefinition().getConstructor());
assertEquals(2, type.getConstructorDefinition().getParameters().length);
@@ -122,10 +122,10 @@
JavaImplementationDefinition type = new JavaImplementationDefinition();
org.apache.tuscany.assembly.Reference ref = ModelHelper.createReference("ref", Foo1.class);
type.getReferences().add(ref);
- type.getReferenceMembers().put("ref", new JavaElement("ref", Foo1.class));
+ type.getReferenceMembers().put("ref", new JavaElement("ref", Foo1.class, null));
org.apache.tuscany.assembly.Reference ref2 = ModelHelper.createReference("ref2", Foo1.class);
type.getReferences().add(ref2);
- type.getReferenceMembers().put("ref2", new JavaElement("ref2", Foo1.class));
+ type.getReferenceMembers().put("ref2", new JavaElement("ref2", Foo1.class, null));
try {
visitEnd(Foo4.class, type);
fail();
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessorTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessorTestCase.java Mon Apr 9 10:47:45 2007
@@ -176,19 +176,19 @@
org.apache.tuscany.assembly.Reference ref = factory.createReference();
ref.setName("reference");
type.getReferences().add(ref);
- type.getReferenceMembers().put("reference", new JavaElement("reference", Ref.class));
+ type.getReferenceMembers().put("reference", new JavaElement("reference", Ref.class, null));
org.apache.tuscany.assembly.Reference ref2 = factory.createReference();
ref2.setName("reference2");
type.getReferences().add(ref2);
- type.getReferenceMembers().put("reference2", new JavaElement("reference2", Ref.class));
+ type.getReferenceMembers().put("reference2", new JavaElement("reference2", Ref.class, null));
org.apache.tuscany.assembly.Property prop1 = factory.createProperty();
prop1.setName("string1");
type.getProperties().add(prop1);
- type.getPropertyMembers().put("string1", new JavaElement("string1", String.class));
+ type.getPropertyMembers().put("string1", new JavaElement("string1", String.class, null));
org.apache.tuscany.assembly.Property prop2 = factory.createProperty();
prop2.setName("string2");
type.getProperties().add(prop2);
- type.getPropertyMembers().put("string2", new JavaElement("string2", String.class));
+ type.getPropertyMembers().put("string2", new JavaElement("string2", String.class, null));
visitEnd(MockService.class, type);
assertEquals(1, type.getServices().size());
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeutisticExtensibleConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeutisticExtensibleConstructorTestCase.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeutisticExtensibleConstructorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/HeutisticExtensibleConstructorTestCase.java Mon Apr 9 10:47:45 2007
@@ -113,7 +113,7 @@
definition.getParameters()[0].setName("");
Property property = factory.createProperty();
// Hack to add a property member
- JavaElement element = new JavaElement("myBar", String.class);
+ JavaElement element = new JavaElement("myBar", String.class, null);
type.getPropertyMembers().put("myBar", element);
property.setName("myBar");
definition.getParameters()[1].setName("myBar");
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java Mon Apr 9 10:47:45 2007
@@ -28,8 +28,8 @@
import java.lang.reflect.Type;
/**
- * This class represents a java element such as a Package, Class, Constructor, Field, Method or
- * Parameter.
+ * This class represents a java element such as a Package, Class, Constructor,
+ * Field, Method or Parameter.
*
* @version $Rev$ $Date$
*/
@@ -40,6 +40,7 @@
private Type genericType;
private int index = -1;
private String name;
+ private Class<? extends Annotation> classifer;
public JavaElement(Package pkg) {
this.anchor = pkg;
@@ -83,16 +84,19 @@
/**
* For testing purpose
- * @param elementType
- * @param type
+ *
* @param name
+ * @param type
+ * @param classifer TODO
+ * @param elementType
*/
- public JavaElement(String name, Class<?> type) {
+ public JavaElement(String name, Class<?> type, Class<? extends Annotation> classifer) {
super();
this.type = type;
this.name = name;
+ this.classifer = classifer;
}
-
+
/**
* @return the anchor
*/
@@ -200,6 +204,20 @@
*/
public void setName(String name) {
this.name = name;
+ }
+
+ /**
+ * @return the classifer
+ */
+ public Class<? extends Annotation> getClassifer() {
+ return classifer;
+ }
+
+ /**
+ * @param classifer the classifer to set
+ */
+ public void setClassifer(Class<? extends Annotation> classifer) {
+ this.classifer = classifer;
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Parameter.java?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Parameter.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Parameter.java Mon Apr 9 10:47:45 2007
@@ -19,15 +19,12 @@
package org.apache.tuscany.implementation.java.impl;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
/**
* @version $Rev$ $Date$
*/
public class Parameter extends JavaElement {
- private Class<? extends Annotation> classifer;
-
/**
* @param constructor
* @param index
@@ -35,19 +32,4 @@
public Parameter(Constructor<?> constructor, int index) {
super(constructor, index);
}
-
- /**
- * @return the classifer
- */
- public Class<? extends Annotation> getClassifer() {
- return classifer;
- }
-
- /**
- * @param classifer the classifer to set
- */
- public void setClassifer(Class<? extends Annotation> classifer) {
- this.classifer = classifer;
- }
-
}
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?view=diff&rev=526852&r1=526851&r2=526852
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Mon Apr 9 10:47:45 2007
@@ -72,8 +72,8 @@
<module>interface-wsdl-xml</module>
<module>implementation-java</module>
<module>implementation-java-xml</module>
- <!--
<module>implementation-java-runtime</module>
+ <!--
<module>implementation-script</module>
<module>implementation-spring</module>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org