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/12 23:30:57 UTC
svn commit: r528243 - in /incubator/tuscany/java/sca/modules:
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/
implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/
implem...
Author: rfeng
Date: Thu Apr 12 14:30:56 2007
New Revision: 528243
URL: http://svn.apache.org/viewvc?view=rev&rev=528243
Log:
Remove the generics from Resource
Add getInterface to Operation
Modified:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/Operation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/DefaultInterfaceContractMapper.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java Thu Apr 12 14:30:56 2007
@@ -73,7 +73,7 @@
private void handleResources(
JavaImplementationDefinition componentType,
JavaAtomicComponent component) {
- for (Resource<?> resource : componentType.getResources().values()) {
+ for (Resource resource : componentType.getResources().values()) {
String name = resource.getName();
ObjectFactory<?> objectFactory = null;
if (objectFactory == null) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java Thu Apr 12 14:30:56 2007
@@ -71,6 +71,7 @@
* 2007) $$
*/
public abstract class PojoAtomicComponent extends AtomicComponentExtension implements ComponentContextProvider {
+
protected Map<String, List<Wire>> wires = new HashMap<String, List<Wire>>();
protected Map<String, List<Wire>> callBackwires = new HashMap<String, List<Wire>>();
@@ -234,7 +235,7 @@
}
public void addResourceFactory(String name, ObjectFactory<?> factory) {
- org.apache.tuscany.implementation.java.impl.Resource<?> resource = configuration.getDefinition().getResources()
+ org.apache.tuscany.implementation.java.impl.Resource resource = configuration.getDefinition().getResources()
.get(name);
if (resource != null && !(resource.getElement().getAnchor() instanceof Constructor)) {
@@ -371,6 +372,15 @@
return (R)proxyService.cast(target);
}
+ public <B> ServiceReference<B> createSelfReference(Class<B> businessInterface, String serviceName) {
+ return null;
+ }
+
+ public <B> ServiceReference<B> createSelfReference(Class<B> businessInterface) {
+ return null;
+ }
+
+
protected abstract <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire);
/**
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ResourceProcessor.java Thu Apr 12 14:30:56 2007
@@ -55,7 +55,7 @@
}
String mappedName = annotation.mappedName();
- Resource<?> resource = createResource(name, new JavaElement(method, 0));
+ Resource resource = createResource(name, new JavaElement(method, 0));
resource.setOptional(annotation.optional());
if (mappedName.length() > 0) {
resource.setMappedName(mappedName);
@@ -80,7 +80,7 @@
String mappedName = annotation.mappedName();
- Resource<?> resource = createResource(name, new JavaElement(field));
+ Resource resource = createResource(name, new JavaElement(field));
resource.setOptional(annotation.optional());
if (mappedName.length() > 0) {
resource.setMappedName(mappedName);
@@ -89,10 +89,10 @@
}
@SuppressWarnings("unchecked")
- public <T> Resource<T> createResource(String name, JavaElement element) {
+ public Resource createResource(String name, JavaElement element) {
element.setClassifer(org.apache.tuscany.api.annotation.Resource.class);
element.setName(name);
- return new Resource<T>(element);
+ return new Resource(element);
}
public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
@@ -118,7 +118,7 @@
String mappedName = resourceAnnotation.mappedName();
- Resource<?> resource = createResource(name, parameter);
+ Resource resource = createResource(name, parameter);
resource.setOptional(resourceAnnotation.optional());
if (mappedName.length() > 0) {
resource.setMappedName(mappedName);
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java Thu Apr 12 14:30:56 2007
@@ -18,15 +18,13 @@
*/
package org.apache.tuscany.implementation.java.impl;
-import java.lang.reflect.Member;
/**
* A resource dependency declared by a Java component implementation
*
* @version $Rev$ $Date$
- * @param <T> the Java type of the resource
*/
-public class Resource<T> {
+public class Resource {
private JavaElement element;
private String mappedName;
private boolean optional;
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/Operation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/Operation.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/Operation.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/Operation.java Thu Apr 12 14:30:56 2007
@@ -95,7 +95,16 @@
*/
void setFaultTypes(List<DataType> faultTypes);
+ /**
+ * Get the owning interface
+ * @return
+ */
Interface getInterface();
+
+ /**
+ * Set the owning interface
+ * @param interfaze
+ */
void setInterface(Interface interfaze);
/**
@@ -140,6 +149,4 @@
* @param wrapperStyle the wrapperStyle to set
*/
void setWrapperStyle(boolean wrapperStyle);
-
-
}
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/DefaultInterfaceContractMapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/DefaultInterfaceContractMapper.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/DefaultInterfaceContractMapper.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/DefaultInterfaceContractMapper.java Thu Apr 12 14:30:56 2007
@@ -55,6 +55,8 @@
if (!source.getName().equals(target.getName())) {
return false;
}
+
+ // FIXME: We need to deal with wrapped<-->unwrapped conversion
// Check output type
DataType sourceOutputType = source.getOutputType();
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java?view=diff&rev=528243&r1=528242&r2=528243
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java Thu Apr 12 14:30:56 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.interfacedef.impl;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.apache.tuscany.interfacedef.Interface;
@@ -33,7 +34,7 @@
private boolean remotable;
private boolean conversational;
- private List<Operation> operations = new ArrayList<Operation>();
+ private OperationList operations = new OperationList();
private boolean unresolved;
public boolean isRemotable() {
@@ -68,6 +69,45 @@
*/
public void setConversational(boolean conversational) {
this.conversational = conversational;
+ }
+
+ private class OperationList extends ArrayList<Operation> {
+ private static final long serialVersionUID = -903469106307606099L;
+
+ @Override
+ public Operation set(int index, Operation element) {
+ element.setInterface(InterfaceImpl.this);
+ return super.set(index, element);
+ }
+
+ @Override
+ public void add(int index, Operation element) {
+ element.setInterface(InterfaceImpl.this);
+ super.add(index, element);
+ }
+
+ @Override
+ public boolean add(Operation o) {
+ o.setInterface(InterfaceImpl.this);
+ return super.add(o);
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends Operation> c) {
+ for (Operation op : c) {
+ op.setInterface(InterfaceImpl.this);
+ }
+ return super.addAll(c);
+ }
+
+ @Override
+ public boolean addAll(int index, Collection<? extends Operation> c) {
+ for (Operation op : c) {
+ op.setInterface(InterfaceImpl.this);
+ }
+ return super.addAll(index, c);
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org