svn commit: r492223 - in /incubator/tuscany/sandbox/lresende: container.das.client/pom.xml container.das/pom.xml container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java

[lresende]

Author: lresende
Date: Wed Jan  3 09:11:23 2007
New Revision: 492223

URL: http://svn.apache.org/viewvc?view=rev&rev=492223
Log:
Updates to get in sync with trunk code

Modified:
    incubator/tuscany/sandbox/lresende/container.das.client/pom.xml
    incubator/tuscany/sandbox/lresende/container.das/pom.xml
    
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java

Modified: incubator/tuscany/sandbox/lresende/container.das.client/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das.client/pom.xml?view=diff&rev=492223&r1=492222&r2=492223
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das.client/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/container.das.client/pom.xml Wed Jan  3 
09:11:23 2007
@@ -42,8 +42,8 @@
         </dependency>
         
         <dependency>
-           <groupId>org.apache.tuscany.sca.runtime</groupId>
-           <artifactId>webapp</artifactId>
+           <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+           <artifactId>webapp-api</artifactId>
            <version>${pom.version}</version>
            <scope>runtime</scope>
         </dependency>

Modified: incubator/tuscany/sandbox/lresende/container.das/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/pom.xml?view=diff&rev=492223&r1=492222&r2=492223
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/container.das/pom.xml Wed Jan  3 
09:11:23 2007
@@ -46,8 +46,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca.runtime</groupId>
-            <artifactId>webapp</artifactId>
+            <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+            <artifactId>webapp-api</artifactId>
             <version>${sca.version}</version>
             <scope>compile</scope>
         </dependency>

Modified: 
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java?view=diff&rev=492223&r1=492222&r2=492223
==============================================================================
--- 
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
 (original)
+++ 
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
 Wed Jan  3 09:11:23 2007
@@ -27,7 +27,6 @@
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.extension.AtomicComponentExtension;
@@ -118,10 +117,11 @@
         if (wire == null) {
             throw new TargetResolutionException("Service '" + service + "'not 
found"); // TODO better error message
         }
-        return wireService.createProxy(wire);
+        Class<?> clazz = wire.getServiceContract().getInterfaceClass();
+        return wireService.createProxy(clazz, wire);
     }
 
-    public DataAccessInstanceImpl getTargetInstance() throws TargetException {
+    public DataAccessInstanceImpl getTargetInstance() throws 
TargetResolutionException {
         return (DataAccessInstanceImpl) scopeContainer.getInstance(this);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]