svn commit: r467337 - in /incubator/tuscany/sandbox/ant/container.easy/src: main/java/org/apache/tuscany/container/easy/ test/java/org/apache/tuscany/container/easy/

[antelder]

Author: antelder
Date: Tue Oct 24 07:15:22 2006
New Revision: 467337

URL: http://svn.apache.org/viewvc?view=rev&rev=467337
Log:
Update for recnt core changes

Modified:
    
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
    
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
    
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
    
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationLoaderTestCase.java

Modified: 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java?view=diff&rev=467337&r1=467336&r2=467337
==============================================================================
--- 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
 (original)
+++ 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
 Tue Oct 24 07:15:22 2006
@@ -55,7 +55,7 @@
     }
 
     protected EasyComponentType loadFromSidefile(URL url, DeploymentContext 
deploymentContext) throws LoaderException {
-        ComponentType ct = loaderRegistry.load(null, url, ComponentType.class, 
deploymentContext);
+        ComponentType ct = loaderRegistry.load(null, null, url, 
ComponentType.class, deploymentContext);
         EasyComponentType scriptComponentType = new EasyComponentType(ct);
         return scriptComponentType;
     }

Modified: 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java?view=diff&rev=467337&r1=467336&r2=467337
==============================================================================
--- 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
 (original)
+++ 
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
 Tue Oct 24 07:15:22 2006
@@ -25,12 +25,8 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 
 import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -51,8 +47,6 @@
     }
 
     public abstract QName getXMLType();
-
-    abstract public EasyImplementation load(CompositeComponent parent, 
XMLStreamReader reader, DeploymentContext deploymentContext) throws 
MissingResourceException, XMLStreamException, LoaderException;
 
     protected String loadSource(ClassLoader cl, String resource) throws 
LoaderException {
         URL url = cl.getResource(resource);

Modified: 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java?view=diff&rev=467337&r1=467336&r2=467337
==============================================================================
--- 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
 Tue Oct 24 07:15:22 2006
@@ -60,7 +60,7 @@
     public void testLoadFromSideFile() throws MalformedURLException, 
LoaderException, XMLStreamException {
         EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
         LoaderRegistry loaderRegistry = new LoaderRegistryImpl() {
-            public <MO extends ModelObject> MO load(CompositeComponent parent, 
URL url, Class<MO> type, DeploymentContext ctx) throws LoaderException {
+            public <MO extends ModelObject> MO load(CompositeComponent parent, 
ModelObject mo, URL url, Class<MO> type, DeploymentContext ctx) throws 
LoaderException {
                 return (MO) new ComponentType();
             }
         };
@@ -74,6 +74,7 @@
         EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
         LoaderRegistry loaderRegistry = new LoaderRegistryImpl() {
             public <MO extends ModelObject> MO load(CompositeComponent parent,
+                    ModelObject mo,
                     URL url,
                     Class<MO> type,
                     DeploymentContext ctx) throws LoaderException {

Modified: 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationLoaderTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationLoaderTestCase.java?view=diff&rev=467337&r1=467336&r2=467337
==============================================================================
--- 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationLoaderTestCase.java
 Tue Oct 24 07:15:22 2006
@@ -31,6 +31,7 @@
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.loader.MissingResourceException;
+import org.apache.tuscany.spi.model.ModelObject;
 
 /**
  * 
@@ -67,7 +68,8 @@
             public QName getXMLType() {
                 return new QName("http://foo";, "bar");
             }
-            public EasyImplementation load(CompositeComponent parent, 
XMLStreamReader reader, DeploymentContext deploymentContext) throws 
MissingResourceException, XMLStreamException, LoaderException {
+//            @Override
+            public EasyImplementation load(CompositeComponent arg0, 
ModelObject arg1, XMLStreamReader arg2, DeploymentContext arg3) throws 
XMLStreamException, LoaderException {
                 return null;
             }};
     }



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