svn commit: r379389 - in /incubator/tuscany/java/sca/container.js/src: main/java/org/apache/tuscany/container/js/assembly/impl/ main/java/org/apache/tuscany/container/js/assembly/sdo/ main/java/org/apache/tuscany/container/js/config/ main/java/org/apac...

[js...@apache.org]

Author: jsdelfino
Date: Mon Feb 20 23:36:51 2006
New Revision: 379389

URL: http://svn.apache.org/viewcvs?rev=379389&view=rev
Log:
ported to new POJO model

Removed:
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/sdo/
Modified:
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/handler/JavaScriptComponentConfigurationHandler.java
    incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java?rev=379389&r1=379388&r2=379389&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java Mon Feb 20 23:36:51 2006
@@ -172,7 +172,7 @@
         Map<String, Object> context = new HashMap<String, Object>();
         List<Property> ps = getProperties();
         for (Property p : ps) {
-            context.put(p.getName(), p.getDefault());
+            context.put(p.getName(), p.getDefaultValue());
         }
         return context;
     }

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java?rev=379389&r1=379388&r2=379389&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptComponentRuntimeConfiguration.java Mon Feb 20 23:36:51 2006
@@ -36,7 +36,7 @@
 	public JavaScriptComponentRuntimeConfiguration(SimpleComponent component, JavaScriptImplementation implementation) {
 		this.component = component;
 		this.implementation = implementation;
-        this.scope = implementation.getServices().get(0).getInterfaceContract().getScope().getValue();
+        this.scope = implementation.getServices().get(0).getServiceContract().getScope().getValue();
 	}
 
 	public SimpleComponentContext createInstanceContext() throws ContextCreationException {

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java?rev=379389&r1=379388&r2=379389&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java Mon Feb 20 23:36:51 2006
@@ -58,7 +58,7 @@
 	public synchronized Object getInstance(QualifiedName qName, boolean notify) throws TargetException {
 		//TODO: should this cache the instance?
 		ConfiguredService service = component.getConfiguredServices().get(0);
-		String iface = service.getPort().getInterfaceContract().getInterface();
+		String iface = service.getPort().getServiceContract().getInterface();
 		Class[] ifaces;
 		try {
 			ifaces = new Class[] { implementation.getResourceLoader().loadClass(iface) };

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/handler/JavaScriptComponentConfigurationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/handler/JavaScriptComponentConfigurationHandler.java?rev=379389&r1=379388&r2=379389&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/handler/JavaScriptComponentConfigurationHandler.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/handler/JavaScriptComponentConfigurationHandler.java Mon Feb 20 23:36:51 2006
@@ -31,8 +31,8 @@
 import org.apache.tuscany.model.assembly.ComponentImplementation;
 import org.apache.tuscany.model.assembly.ConfiguredPort;
 import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.Interface;
-import org.apache.tuscany.model.assembly.Part;
+import org.apache.tuscany.model.assembly.ServiceContract;
+import org.apache.tuscany.model.assembly.AggregatePart;
 import org.apache.tuscany.model.assembly.ScopeEnum;
 import org.apache.tuscany.model.types.InterfaceType;
 import org.apache.tuscany.model.types.OperationType;
@@ -55,7 +55,7 @@
             return true;
 
         ConfiguredService serviceEndpoint = (ConfiguredService) portEndpoint;
-        Part part = serviceEndpoint.getPart();
+        AggregatePart part = serviceEndpoint.getPart();
         if (!(part instanceof Component))
             return true;
         Component component = (Component) part;
@@ -75,7 +75,7 @@
         Map<OperationType, InvocationConfiguration>invocationConfigurations=proxyConfiguration.getInvocationConfigurations();
         Map<Integer,ScopeContext> scopeContainers = proxyConfiguration.getScopeContainers();
 
-        Interface targetInterface = serviceEndpoint.getService().getInterfaceContract();
+        ServiceContract targetInterface = serviceEndpoint.getService().getServiceContract();
         InterfaceType targetInterfaceType = targetInterface.getInterfaceType();
         ScopeEnum scope = targetInterface.getScope();
         String serviceAddress = serviceEndpoint.getPart().getName(); 

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java?rev=379389&r1=379388&r2=379389&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java Mon Feb 20 23:36:51 2006
@@ -21,13 +21,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.model.assembly.AssemblyLoader;
 import org.apache.tuscany.model.assembly.AssemblyModelContext;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.ConfiguredService;
 import org.apache.tuscany.model.assembly.EntryPoint;
 import org.apache.tuscany.model.assembly.Module;
 import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
+import org.apache.tuscany.model.assembly.loader.AssemblyLoader;
 import org.apache.tuscany.model.types.InterfaceType;
 import org.apache.tuscany.model.types.OperationType;