Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 16142 invoked from network); 11 Sep 2006 08:56:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Sep 2006 08:56:27 -0000 Received: (qmail 11111 invoked by uid 500); 11 Sep 2006 08:56:27 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 11032 invoked by uid 500); 11 Sep 2006 08:56:26 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 11023 invoked by uid 99); 11 Sep 2006 08:56:26 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2006 01:56:26 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2006 01:56:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7E6F61A981A; Mon, 11 Sep 2006 01:56:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r442129 - in /incubator/tuscany/sandbox/ant/container.python/src/main/java/org/apache/tuscany/container/python: PythonComponent.java PythonComponentBuilder.java PythonComponentTypeLoader.java Date: Mon, 11 Sep 2006 08:56:05 -0000 To: tuscany-commits@ws.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060911085605.7E6F61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 extends AtomicComponentExtension { +public class PythonComponent extends AtomicComponentExtension { private final List> services; @@ -64,7 +64,7 @@ Map context = new HashMap(getProperties()); for (List 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 componentDefinition, + public Component build(CompositeComponent parent, ComponentDefinition 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