You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2006/09/11 10:56:05 UTC
svn commit: r442129 - in
/incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python:
PythonComponent.java PythonComponentBuilder.java
PythonComponentTypeLoader.java
Author: antelder
Date: Mon Sep 11 01:56:04 2006
New Revision: 442129
URL: http://svn.apache.org/viewvc?view=rev&rev=442129
Log:
Fix compile errors from the core generics changes from http://svn.apache.org/viewvc?view=rev&rev=441893
Modified:
incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponent.java
incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentBuilder.java
incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentTypeLoader.java
Modified: incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponent.java?view=diff&rev=442129&r1=442128&r2=442129
==============================================================================
--- incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponent.java (original)
+++ incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponent.java Mon Sep 11 01:56:04 2006
@@ -40,7 +40,7 @@
/**
* A component implementation for the Python language.
*/
-public class PythonComponent<T> extends AtomicComponentExtension<T> {
+public class PythonComponent extends AtomicComponentExtension {
private final List<Class<?>> services;
@@ -64,7 +64,7 @@
Map<String, Object> context = new HashMap<String, Object>(getProperties());
for (List<OutboundWire> referenceWires : getOutboundWires().values()) {
- for (OutboundWire<?> wire : referenceWires) {
+ for (OutboundWire wire : referenceWires) {
Object wireProxy = wireService.createProxy(wire);
context.put(wire.getReferenceName(), wireProxy);
}
@@ -75,7 +75,7 @@
return instance;
}
- public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+ public TargetInvoker createTargetInvoker(String serviceName, Operation operation) {
Method[] methods = operation.getServiceContract().getInterfaceClass().getMethods();
Method method = findMethod(operation, methods);
return new PythonInvoker(method, this);
@@ -95,19 +95,19 @@
return scopeContainer.getInstance(this);
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return getServiceInstance(null);
}
@SuppressWarnings("unchecked")
- public T getServiceInstance(String service) throws TargetException {
- InboundWire<?> wire = getInboundWire(service);
+ public Object getServiceInstance(String service) throws TargetException {
+ InboundWire wire = getInboundWire(service);
if (wire == null) {
TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
e.setIdentifier(service);
throw e;
}
- return (T) wireService.createProxy(wire);
+ return wireService.createProxy(wire);
}
}
Modified: incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentBuilder.java?view=diff&rev=442129&r1=442128&r2=442129
==============================================================================
--- incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentBuilder.java Mon Sep 11 01:56:04 2006
@@ -45,7 +45,7 @@
}
@SuppressWarnings("unchecked")
- public Component<?> build(CompositeComponent<?> parent, ComponentDefinition<PythonImplementation> componentDefinition,
+ public Component build(CompositeComponent parent, ComponentDefinition<PythonImplementation> componentDefinition,
DeploymentContext deploymentContext) throws BuilderConfigException {
String name = componentDefinition.getName();
Modified: incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentTypeLoader.java?view=diff&rev=442129&r1=442128&r2=442129
==============================================================================
--- incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python/PythonComponentTypeLoader.java Mon Sep 11 01:56:04 2006
@@ -45,7 +45,7 @@
// TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension
- public void load(CompositeComponent<?> parent, PythonImplementation implementation, DeploymentContext deploymentContext) throws LoaderException {
+ public void load(CompositeComponent parent, PythonImplementation implementation, DeploymentContext deploymentContext) throws LoaderException {
String sideFile = getSideFileName(implementation);
URL resource = implementation.getJythonScript().getClassLoader().getResource(sideFile);
PythonComponentType componentType;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org