You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/04/11 12:05:20 UTC
svn commit: r393172 [5/5] - in
/incubator/tuscany/sandbox/sebastien/java/sca: ./
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/
binding...
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPortImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPortImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPortImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPortImpl.java Tue Apr 11 03:05:02 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import org.apache.tuscany.model.assembly.AggregatePart;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.Part;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.ConfiguredPort;
import org.apache.tuscany.model.assembly.Port;
@@ -26,95 +26,62 @@
* Implementation of ConfiguredPort.
*/
public abstract class ConfiguredPortImpl extends AssemblyModelObjectImpl implements ConfiguredPort {
- private AggregatePart aggregatePart;
+ private String name;
+ private Part part;
private Port port;
- private Object contextFactory;
private Object proxyFactory;
- /**
- * Constructor
- */
protected ConfiguredPortImpl() {
}
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ checkNotFrozen();
+ this.name=name;
+ }
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredPort#getPort()
- */
public Port getPort() {
return port;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredPort#setPort(org.apache.tuscany.model.assembly.Port)
- */
public void setPort(Port port) {
checkNotFrozen();
this.port = port;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredPort#getAggregatePart()
- */
- public AggregatePart getAggregatePart() {
- checkInitialized();
- return aggregatePart;
+ public Part getPart() {
+ return part;
}
-
- /**
- * Sets the aggregate part containing this configured port.
- * @param aggregatePart
- */
- protected void setAggregatePart(AggregatePart aggregatePart) {
+
+ public void setPart(Part part) {
checkNotFrozen();
- this.aggregatePart=aggregatePart;
+ this.part=part;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredPort#getProxyFactory()
- */
public Object getProxyFactory() {
return proxyFactory;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredPort#setProxyFactory(java.lang.Object)
- */
public void setProxyFactory(Object proxyFactory) {
checkNotFrozen();
this.proxyFactory = proxyFactory;
}
- /**
- * @see org.apache.tuscany.model.assembly.ContextFactoryHolder#getContextFactory()
- */
- public Object getContextFactory() {
- return contextFactory;
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ContextFactoryHolder#setContextFactory(java.lang.Object)
- */
- public void setContextFactory(Object configuration) {
- checkNotFrozen();
- contextFactory = configuration;
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
- if (port!=null)
+ if (port!=null) {
+ name=port.getName();
port.initialize(modelContext);
+ }
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#freeze()
- */
public void freeze() {
if (isFrozen())
return;
@@ -124,10 +91,7 @@
port.freeze();
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPropertyImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPropertyImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPropertyImpl.java Tue Apr 11 03:05:02 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.ConfiguredProperty;
import org.apache.tuscany.model.assembly.OverrideOption;
import org.apache.tuscany.model.assembly.Property;
@@ -31,9 +31,6 @@
private Object value;
private Property property;
- /**
- * Constructor
- */
protected ConfiguredPropertyImpl() {
}
@@ -45,55 +42,34 @@
this.name = name;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#getProperty()
- */
public Property getProperty() {
return property;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#setProperty(org.apache.tuscany.model.assembly.Property)
- */
public void setProperty(Property property) {
checkNotFrozen();
this.property = property;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#getValue()
- */
public Object getValue() {
return value;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#setValue(java.lang.Object)
- */
public void setValue(Object value) {
checkNotFrozen();
this.value = value;
}
- /*
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#getOverrideOption()
- */
public OverrideOption getOverrideOption() {
return overrideOption;
}
- /*
- * @see org.apache.tuscany.model.assembly.ConfiguredProperty#setOverrideOption(org.apache.tuscany.model.assembly.OverrideOption)
- */
public void setOverrideOption(OverrideOption value) {
checkNotFrozen();
this.overrideOption=value;
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
@@ -102,9 +78,6 @@
property.initialize(modelContext);
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#freeze()
- */
public void freeze() {
if (isFrozen())
return;
@@ -114,10 +87,7 @@
property.freeze();
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredReferenceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredReferenceImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredReferenceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredReferenceImpl.java Tue Apr 11 03:05:02 2006
@@ -17,7 +17,6 @@
package org.apache.tuscany.model.assembly.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.tuscany.model.assembly.ConfiguredReference;
@@ -29,57 +28,34 @@
*/
public class ConfiguredReferenceImpl extends ConfiguredPortImpl implements ConfiguredReference {
- private String name;
private List<String> targets = new ArrayList<String>();
private List<ConfiguredService> targetConfiguredServices = new ArrayList<ConfiguredService>();
protected ConfiguredReferenceImpl() {
}
-
- public String getName() {
- return name;
+
+ public Reference getReference() {
+ return (Reference)super.getPort();
}
-
- public void setName(String name) {
- this.name = name;
+
+ public void setReference(Reference reference) {
+ super.setPort(reference);
}
public List<String> getTargets() {
return targets;
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredReference#getReference()
- */
- public Reference getReference() {
- return (Reference) super.getPort();
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredReference#setReference(org.apache.tuscany.model.assembly.Reference)
- */
- public void setReference(Reference reference) {
- checkNotFrozen();
- super.setPort(reference);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredReference#getTargetConfiguredServices()
- */
public List<ConfiguredService> getTargetConfiguredServices() {
return targetConfiguredServices;
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.ConfiguredPortImpl#freeze()
- */
public void freeze() {
super.freeze();
- // Freeze list of configured services
- targetConfiguredServices = Collections.unmodifiableList(targetConfiguredServices);
- targets = Collections.unmodifiableList(targets);
+ targetConfiguredServices = freeze(targetConfiguredServices);
+ targets = freeze(targets);
}
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredServiceImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredServiceImpl.java Tue Apr 11 03:05:02 2006
@@ -24,24 +24,14 @@
*/
public class ConfiguredServiceImpl extends ConfiguredPortImpl implements ConfiguredService {
- /**
- * Constructor
- */
protected ConfiguredServiceImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredService#getService()
- */
public Service getService() {
return (Service) super.getPort();
}
- /**
- * @see org.apache.tuscany.model.assembly.ConfiguredService#setService(org.apache.tuscany.model.assembly.Service)
- */
public void setService(Service service) {
- checkNotFrozen();
super.setPort(service);
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/EntryPointImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/EntryPointImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/EntryPointImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/EntryPointImpl.java Tue Apr 11 03:05:02 2006
@@ -17,11 +17,10 @@
package org.apache.tuscany.model.assembly.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.Binding;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
@@ -30,70 +29,49 @@
/**
* An implementation of EntryPoint.
*/
-public class EntryPointImpl extends AggregatePartImpl implements EntryPoint {
+public class EntryPointImpl extends PartImpl implements EntryPoint {
private ConfiguredService configuredService;
private ConfiguredReference configuredReference;
private List<Binding> bindings=new ArrayList<Binding>();
-
- /**
- * Constructor
- */
+
protected EntryPointImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.EntryPoint#getConfiguredReference()
- */
public ConfiguredReference getConfiguredReference() {
return configuredReference;
}
- /**
- * @see org.apache.tuscany.model.assembly.EntryPoint#setConfiguredReference(org.apache.tuscany.model.assembly.ConfiguredReference)
- */
public void setConfiguredReference(ConfiguredReference configuredReference) {
checkNotFrozen();
+ configuredReference.setPart(this);
this.configuredReference=configuredReference;
}
- /**
- * @see org.apache.tuscany.model.assembly.EntryPoint#getConfiguredService()
- */
public ConfiguredService getConfiguredService() {
return configuredService;
}
- /**
- * @see org.apache.tuscany.model.assembly.EntryPoint#setConfiguredService(org.apache.tuscany.model.assembly.ConfiguredService)
- */
public void setConfiguredService(ConfiguredService configuredService) {
checkNotFrozen();
+ configuredService.setPart(this);
this.configuredService=configuredService;
}
- /**
- * @see org.apache.tuscany.model.assembly.EntryPoint#getBindings()
- */
public List<Binding> getBindings() {
return bindings;
}
-
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
// Initialize the service contract and reference to the published service
if (configuredReference != null) {
- ((ConfiguredPortImpl)configuredReference).setAggregatePart(this);
configuredReference.initialize(modelContext);
}
if (configuredService != null) {
- ((ConfiguredPortImpl)configuredService).setAggregatePart(this);
configuredService.initialize(modelContext);
}
@@ -101,9 +79,6 @@
initialize(bindings, modelContext);
}
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#freeze()
- */
public void freeze() {
if (isFrozen())
return;
@@ -116,14 +91,10 @@
configuredService.freeze();
// Freeze the bindings
- bindings=Collections.unmodifiableList(bindings);
- freeze(bindings);
+ bindings=freeze(bindings);
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExtensibleImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExtensibleImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExtensibleImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExtensibleImpl.java Tue Apr 11 03:05:02 2006
@@ -19,8 +19,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.Extensible;
/**
@@ -31,30 +31,18 @@
private List<Object> extensibilityElements=new ArrayList<Object>();
private List<Object> extensibilityAttributes=new ArrayList<Object>();
- /**
- * Constructor
- */
protected ExtensibleImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Extensible#getExtensibilityElements()
- */
public List getExtensibilityElements() {
return extensibilityElements;
}
- /**
- * @see org.apache.tuscany.model.assembly.Extensible#getExtensibilityAttributes()
- */
public List getExtensibilityAttributes() {
return extensibilityAttributes;
}
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
@@ -74,10 +62,7 @@
freeze(extensibilityAttributes);
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExternalServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExternalServiceImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExternalServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExternalServiceImpl.java Tue Apr 11 03:05:02 2006
@@ -17,11 +17,10 @@
package org.apache.tuscany.model.assembly.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.Binding;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.ExternalService;
@@ -30,66 +29,55 @@
/**
* An implementation ExternalService.
*/
-public class ExternalServiceImpl extends AggregatePartImpl implements ExternalService {
+public class ExternalServiceImpl extends PartImpl implements ExternalService {
private ConfiguredService configuredService;
private OverrideOption overrideOption;
private List<Binding> bindings=new ArrayList<Binding>();
+
+ private Object contextFactory;
- /**
- * Constructor
- */
protected ExternalServiceImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.sdo.impl.ExternalServiceImpl#getOverrideOption()
- */
public OverrideOption getOverrideOption() {
return overrideOption;
}
- /**
- * @see org.apache.tuscany.model.assembly.ExternalService#setOverrideOption(org.apache.tuscany.model.assembly.OverrideOption)
- */
public void setOverrideOption(OverrideOption newOverridable) {
checkNotFrozen();
overrideOption=newOverridable;
}
- /**
- * @see org.apache.tuscany.model.assembly.ExternalService#getBindings()
- */
public List<Binding> getBindings() {
return bindings;
}
- /**
- * @see org.apache.tuscany.model.assembly.ExternalService#getConfiguredService()
- */
public ConfiguredService getConfiguredService() {
return configuredService;
}
- /**
- * @see org.apache.tuscany.model.assembly.ExternalService#setConfiguredService(org.apache.tuscany.model.assembly.ConfiguredService)
- */
public void setConfiguredService(ConfiguredService configuredService) {
checkNotFrozen();
+ configuredService.setPart(this);
this.configuredService=configuredService;
}
+
+ public Object getContextFactory() {
+ return contextFactory;
+ }
+
+ public void setContextFactory(Object contextFactory) {
+ this.contextFactory=contextFactory;
+ }
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
// Initialize the configured service
if (configuredService != null) {
- ((ConfiguredPortImpl)configuredService).setAggregatePart(this);
configuredService.initialize(modelContext);
}
@@ -97,9 +85,6 @@
initialize(bindings, modelContext);
}
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#freeze()
- */
public void freeze() {
if (isFrozen())
return;
@@ -110,14 +95,10 @@
configuredService.freeze();
// Freeze the bindings
- bindings=Collections.unmodifiableList(bindings);
- freeze(bindings);
+ bindings=freeze(bindings);
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.ExtensibleImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ImportWSDLImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ImportWSDLImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ImportWSDLImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ImportWSDLImpl.java Tue Apr 11 03:05:02 2006
@@ -16,8 +16,12 @@
*/
package org.apache.tuscany.model.assembly.impl;
+import java.net.URL;
+
import javax.wsdl.Definition;
+import org.apache.tuscany.common.resource.ResourceLoader;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.ImportWSDL;
/**
@@ -30,9 +34,6 @@
private String namespace;
private Definition definition;
- /**
- * Hide default constructor.
- */
protected ImportWSDLImpl() {
}
@@ -59,6 +60,23 @@
}
public void setDefinition(Definition definition) {
+ checkNotFrozen();
this.definition = definition;
}
+
+ public void initialize(AssemblyContext modelContext) {
+ if (isInitialized())
+ return;
+ super.initialize(modelContext);
+
+ // Load the WSDL definition if necessary
+ ResourceLoader resourceLoader = modelContext.getApplicationResourceLoader();
+ if (definition == null) {
+ URL url = resourceLoader.getResource(location);
+ if (url == null)
+ throw new IllegalArgumentException("Cannot find " + location);
+ definition = modelContext.getAssemblyLoader().loadDefinition(url.toString());
+ }
+ }
+
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleComponentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleComponentImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleComponentImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleComponentImpl.java Tue Apr 11 03:05:02 2006
@@ -37,14 +37,14 @@
*/
public void setModuleImplementation(Module module) {
checkNotFrozen();
- super.setComponentImplementation(module);
+ super.setImplementation(module);
}
/**
* @see org.apache.tuscany.model.assembly.ModuleComponent#getModuleImplementation()
*/
public Module getModuleImplementation() {
- return (Module)super.getComponentImplementation();
+ return (Module)super.getImplementation();
}
/**
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleFragmentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleFragmentImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleFragmentImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleFragmentImpl.java Tue Apr 11 03:05:02 2006
@@ -21,7 +21,7 @@
/**
* An implementation of ModuleFragment.
*/
-public class ModuleFragmentImpl extends AggregateImpl implements ModuleFragment {
+public class ModuleFragmentImpl extends CompositeImpl implements ModuleFragment {
/**
* Constructor
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleImpl.java Tue Apr 11 03:05:02 2006
@@ -16,17 +16,15 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ComponentType;
+import org.apache.tuscany.model.assembly.ComponentInfo;
import org.apache.tuscany.model.assembly.ConfiguredProperty;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
@@ -41,16 +39,29 @@
import org.apache.tuscany.model.assembly.ServiceContract;
import org.apache.tuscany.model.assembly.ServiceURI;
import org.apache.tuscany.model.assembly.Wire;
+import org.apache.tuscany.model.util.NotifyingList;
/**
* An implementation of Module.
*/
-public class ModuleImpl extends AggregateImpl implements Module {
+public class ModuleImpl extends CompositeImpl implements Module {
- private List<ModuleFragment> moduleFragments = new ArrayList<ModuleFragment>();
- private Map<String, ModuleFragment> moduleFragmentsMap;
- private ComponentType componentType;
- private Object contextFactory;
+ /**
+ * A list of module fragments synchronized with a map
+ */
+ private class ModuleFragmentList<E extends ModuleFragment> extends NotifyingList<E>{
+ protected void added(E element) {
+ moduleFragmentsMap.put(element.getName(), element);
+ }
+ protected void removed(E element) {
+ moduleFragmentsMap.remove(element.getName());
+ }
+ }
+
+ private List<ModuleFragment> moduleFragments = new ModuleFragmentList<ModuleFragment>();
+ private Map<String, ModuleFragment> moduleFragmentsMap=new HashMap<String, ModuleFragment>();
+
+ private ComponentInfo componentInfo;
/**
* Constructor
@@ -58,47 +69,30 @@
protected ModuleImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.ComponentImplementation#getComponentType()
- */
- public ComponentType getComponentType() {
- return componentType;
+ public ComponentInfo getComponentInfo() {
+ return componentInfo;
}
- /**
- * @see org.apache.tuscany.model.assembly.ComponentImplementation#setComponentType(org.apache.tuscany.model.assembly.ComponentType)
- */
- public void setComponentType(ComponentType componentType) {
+ public void setComponentInfo(ComponentInfo componentType) {
checkNotFrozen();
- this.componentType=componentType;
+ this.componentInfo=componentType;
}
- /**
- * @see org.apache.tuscany.model.assembly.Module#getModuleFragments()
- */
public List<ModuleFragment> getModuleFragments() {
return moduleFragments;
}
- /**
- * @see org.apache.tuscany.model.assembly.Module#getModuleFragment(java.lang.String)
- */
public ModuleFragment getModuleFragment(String name) {
checkInitialized();
return moduleFragmentsMap.get(name);
}
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
- // Populate map of module fragments
- moduleFragmentsMap = new HashMap<String, ModuleFragment>();
+ // Initialize module fragments
for (ModuleFragment moduleFragment : moduleFragments) {
- moduleFragmentsMap.put(moduleFragment.getName(), moduleFragment);
// Add all WSDL imports, components, entry points and external services from the module fragments
getWSDLImports().addAll(moduleFragment.getWSDLImports());
@@ -112,21 +106,21 @@
moduleFragment.initialize(modelContext);
}
- // Initialize the aggregate
+ // Initialize the composite
super.initialize(modelContext);
// Derive the component type from the entry points and external services in the module
// Also derive properties from the overridable properties of the components in the module
- if (componentType==null) {
+ if (componentInfo==null) {
AssemblyFactory factory = modelContext.getAssemblyFactory();
- componentType = factory.createComponentType();
+ componentInfo = factory.createComponentType();
for (EntryPoint entryPoint : getEntryPoints()) {
Service service = factory.createService();
service.setName(entryPoint.getName());
ServiceContract serviceContract = entryPoint.getConfiguredService().getService().getServiceContract();
if (serviceContract != null)
service.setServiceContract(serviceContract);
- componentType.getServices().add(service);
+ componentInfo.getServices().add(service);
ConfiguredReference configuredReference = entryPoint.getConfiguredReference();
ServiceURI sourceURI = factory.createServiceURI(null, entryPoint, configuredReference);
@@ -146,16 +140,16 @@
ServiceContract serviceContract = externalService.getConfiguredService().getService().getServiceContract();
if (serviceContract != null)
reference.setServiceContract(serviceContract);
- componentType.getReferences().add(reference);
+ componentInfo.getReferences().add(reference);
}
for (Component component : getComponents()) {
for (ConfiguredProperty configuredProperty : component.getConfiguredProperties()) {
if (configuredProperty.getOverrideOption()==null || configuredProperty.getOverrideOption()==OverrideOption.NO)
continue;
- componentType.getProperties().add(configuredProperty.getProperty());
+ componentInfo.getProperties().add(configuredProperty.getProperty());
}
- for (ConfiguredReference configuredReference : component.getConfiguredReferences().values()) {
+ for (ConfiguredReference configuredReference : component.getConfiguredReferences()) {
// Create a wire
ServiceURI sourceURI =factory.createServiceURI(null, component, configuredReference);
for (String target : configuredReference.getTargets()) {
@@ -168,7 +162,7 @@
}
}
}
- componentType.initialize(modelContext);
+ componentInfo.initialize(modelContext);
// Wire the module parts
@@ -180,12 +174,12 @@
String partName = sourceURI.getPartName();
String referenceName = sourceURI.getServiceName();
if (referenceName != null) {
- Component component = getComponent(partName);
+ Component component = (Component)getPart(partName);
if (component != null) {
configuredReference = component.getConfiguredReference(referenceName);
}
} else {
- EntryPoint entryPoint = getEntryPoint(partName);
+ EntryPoint entryPoint = (EntryPoint)getPart(partName);
if (entryPoint != null) {
configuredReference = entryPoint.getConfiguredReference();
}
@@ -215,7 +209,7 @@
}
/**
- * @see org.apache.tuscany.model.assembly.AssemblyModelObject#freeze()
+ * @see org.apache.tuscany.model.assembly.AssemblyObject#freeze()
*/
public void freeze() {
if (isFrozen())
@@ -223,36 +217,20 @@
super.freeze();
// Freeze component type and module fragments
- if (componentType!=null)
- componentType.freeze();
- moduleFragments=Collections.unmodifiableList(moduleFragments);
- freeze(moduleFragments);
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ContextFactoryHolder#getContextFactory()
- */
- public Object getContextFactory() {
- return contextFactory;
- }
-
- /**
- * @see org.apache.tuscany.model.assembly.ContextFactoryHolder#setContextFactory(java.lang.Object)
- */
- public void setContextFactory(Object configuration) {
- checkNotFrozen();
- this.contextFactory = configuration;
+ if (componentInfo!=null)
+ componentInfo.freeze();
+ moduleFragments=freeze(moduleFragments);
}
/**
- * @see org.apache.tuscany.model.assembly.impl.AggregateImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
+ * @see org.apache.tuscany.model.assembly.impl.CompositeImpl#accept(org.apache.tuscany.model.assembly.AssemblyVisitor)
*/
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
- if (componentType!=null) {
- if (!componentType.accept(visitor))
+ if (componentInfo!=null) {
+ if (!componentInfo.accept(visitor))
return false;
}
Added: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java?rev=393172&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java Tue Apr 11 03:05:02 2006
@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tuscany.model.assembly.impl;
+
+import org.apache.tuscany.model.assembly.Composite;
+import org.apache.tuscany.model.assembly.Part;
+
+/**
+ * Implementation of Part.
+ */
+public abstract class PartImpl extends ExtensibleImpl implements Part {
+ private Composite composite;
+ private String name;
+
+ private Object contextFactory;
+
+ protected PartImpl() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String value) {
+ checkNotFrozen();
+ name=value;
+ }
+
+ public Composite getComposite() {
+ return composite;
+ }
+
+ public void setComposite(Composite composite) {
+ checkNotFrozen();
+ this.composite=composite;
+ }
+
+ public Object getContextFactory() {
+ return contextFactory;
+ }
+
+ public void setContextFactory(Object contextFactory) {
+ checkNotFrozen();
+ this.contextFactory=contextFactory;
+ }
+
+}
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PartImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PortImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PortImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PortImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PortImpl.java Tue Apr 11 03:05:02 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.AssemblyModelVisitor;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyVisitor;
import org.apache.tuscany.model.assembly.Port;
import org.apache.tuscany.model.assembly.ServiceContract;
@@ -29,46 +29,28 @@
private ServiceContract serviceContract;
private String name;
- /**
- * Constructor
- */
protected PortImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Port#getName()
- */
public String getName() {
return name;
}
- /**
- * @see org.apache.tuscany.model.assembly.Port#setName(java.lang.String)
- */
public void setName(String value) {
checkNotFrozen();
name=value;
}
- /**
- * @see org.apache.tuscany.model.assembly.Port#getServiceContract()
- */
public ServiceContract getServiceContract() {
return serviceContract;
}
- /**
- * @see org.apache.tuscany.model.assembly.Port#setServiceContract(org.apache.tuscany.model.assembly.ServiceContract)
- */
public void setServiceContract(ServiceContract value) {
checkNotFrozen();
serviceContract=value;
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
@@ -77,9 +59,6 @@
serviceContract.initialize(modelContext);
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#freeze()
- */
public void freeze() {
if (isFrozen())
return;
@@ -89,10 +68,7 @@
serviceContract.freeze();
}
- /**
- * @see org.apache.tuscany.model.assembly.impl.AssemblyModelObjectImpl#accept(org.apache.tuscany.model.assembly.AssemblyModelVisitor)
- */
- public boolean accept(AssemblyModelVisitor visitor) {
+ public boolean accept(AssemblyVisitor visitor) {
if (!super.accept(visitor))
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java Tue Apr 11 03:05:02 2006
@@ -29,81 +29,49 @@
private boolean required;
private Class<?> type;
- /**
- * Constructor
- */
protected PropertyImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#getDefaultValue()
- */
public Object getDefaultValue() {
return defaultValue;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#getName()
- */
public String getName() {
return name;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#getType()
- */
public Class<?> getType() {
return type;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#isMany()
- */
public boolean isMany() {
return many;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#isRequired()
- */
public boolean isRequired() {
return required;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#setDefaultValue(java.lang.Object)
- */
public void setDefaultValue(Object value) {
+ checkNotFrozen();
defaultValue = value;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#setMany(boolean)
- */
public void setMany(boolean value) {
checkNotFrozen();
many = value;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#setName(java.lang.String)
- */
public void setName(String value) {
checkNotFrozen();
name = value;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#setRequired(boolean)
- */
public void setRequired(boolean value) {
checkNotFrozen();
required = value;
}
- /**
- * @see org.apache.tuscany.model.assembly.Property#setType(java.lang.Class)
- */
public void setType(Class<?> value) {
checkNotFrozen();
type = value;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ReferenceImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ReferenceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ReferenceImpl.java Tue Apr 11 03:05:02 2006
@@ -26,22 +26,13 @@
private Multiplicity multiplicity;
- /**
- * Constructor
- */
protected ReferenceImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Reference#getMultiplicity()
- */
public Multiplicity getMultiplicity() {
return multiplicity;
}
- /**
- * @see org.apache.tuscany.model.assembly.Reference#setMultiplicity(org.apache.tuscany.model.assembly.Multiplicity)
- */
public void setMultiplicity(Multiplicity multiplicity) {
checkNotFrozen();
this.multiplicity=multiplicity;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceContractImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceContractImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceContractImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceContractImpl.java Tue Apr 11 03:05:02 2006
@@ -28,52 +28,31 @@
private Class callbackInterface;
private Scope scope;
- /**
- * Constructor
- */
protected ServiceContractImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#getCallbackInterface()
- */
public Class getCallbackInterface() {
return callbackInterface;
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#getInterface()
- */
public Class getInterface() {
return interface_;
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#getScope()
- */
public Scope getScope() {
return scope;
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#setCallbackInterface(java.lang.Class)
- */
public void setCallbackInterface(Class value) {
checkNotFrozen();
callbackInterface=value;
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#setInterface(java.lang.Class)
- */
public void setInterface(Class value) {
checkNotFrozen();
interface_=value;
}
- /**
- * @see org.apache.tuscany.model.assembly.ServiceContract#setScope(org.apache.tuscany.model.assembly.Scope)
- */
public void setScope(Scope scope) {
checkNotFrozen();
this.scope=scope;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceImpl.java Tue Apr 11 03:05:02 2006
@@ -23,9 +23,6 @@
*/
public class ServiceImpl extends PortImpl implements Service {
- /**
- * Constructor
- */
protected ServiceImpl() {
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java Tue Apr 11 03:05:02 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.ModuleComponent;
-import org.apache.tuscany.model.assembly.AggregatePart;
+import org.apache.tuscany.model.assembly.Part;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.ServiceURI;
@@ -38,6 +38,7 @@
/**
* Constructor
+ * @param address
*/
protected ServiceURIImpl(String address) {
this.address = address;
@@ -49,7 +50,7 @@
* @param moduleComponent
* @param configuredPort
*/
- protected ServiceURIImpl(ModuleComponent moduleComponent, AggregatePart aggregatePart, ConfiguredPort configuredPort) {
+ protected ServiceURIImpl(ModuleComponent moduleComponent, Part aggregatePart, ConfiguredPort configuredPort) {
if (moduleComponent != null)
moduleComponentName = moduleComponent.getName();
else
@@ -151,18 +152,30 @@
}
}
+ /**
+ * Returns the module component name
+ * @return
+ */
public String getModuleComponentName() {
if (!isParsed)
parse();
return moduleComponentName;
}
+ /**
+ * Returns the part name
+ * @return
+ */
public String getPartName() {
if (!isParsed)
parse();
return partName;
}
+ /**
+ * Returns the service name
+ * @return
+ */
public String getServiceName() {
if (!isParsed)
parse();
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java Tue Apr 11 03:05:02 2006
@@ -21,26 +21,17 @@
/**
* An implementation of Subsystem.
*/
-public class SubsystemImpl extends AggregateImpl implements Subsystem {
+public class SubsystemImpl extends CompositeImpl implements Subsystem {
private String uri;
- /**
- * Constructor
- */
protected SubsystemImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Subsystem#getURI()
- */
public String getURI() {
return uri;
}
- /**
- * @see org.apache.tuscany.model.assembly.Subsystem#setURI(java.lang.String)
- */
public void setURI(String value) {
checkNotFrozen();
uri=value;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/WireImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/WireImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/WireImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/WireImpl.java Tue Apr 11 03:05:02 2006
@@ -27,37 +27,22 @@
private ServiceURI source;
private ServiceURI target;
- /**
- * Constructor
- */
protected WireImpl() {
}
- /**
- * @see org.apache.tuscany.model.assembly.Wire#getSource()
- */
public ServiceURI getSource() {
return source;
}
- /**
- * @see org.apache.tuscany.model.assembly.Wire#setSource(org.apache.tuscany.model.assembly.ServiceURI)
- */
public void setSource(ServiceURI uri) {
checkNotFrozen();
source=uri;
}
- /**
- * @see org.apache.tuscany.model.assembly.Wire#getTarget()
- */
public ServiceURI getTarget() {
return target;
}
- /**
- * @see org.apache.tuscany.model.assembly.Wire#setTarget(org.apache.tuscany.model.assembly.ServiceURI)
- */
public void setTarget(ServiceURI uri) {
checkNotFrozen();
target=uri;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java Tue Apr 11 03:05:02 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.model.types.java.impl;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.ServiceContractImpl;
import org.apache.tuscany.model.types.java.JavaServiceContract;
@@ -49,9 +49,9 @@
}
/**
- * @see org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
+ * @see org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyContext)
*/
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
Modified: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java Tue Apr 11 03:05:02 2006
@@ -30,7 +30,7 @@
import org.objectweb.asm.Type;
import org.apache.tuscany.common.resource.ResourceLoader;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.ServiceContractImpl;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
import org.apache.tuscany.model.types.wsdl.WSDLServiceContract;
@@ -90,9 +90,9 @@
}
/**
- * @see org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
+ * @see org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyContext)
*/
- public void initialize(AssemblyModelContext modelContext) {
+ public void initialize(AssemblyContext modelContext) {
if (isInitialized())
return;
super.initialize(modelContext);
Added: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java?rev=393172&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java Tue Apr 11 03:05:02 2006
@@ -0,0 +1,107 @@
+/**
+ *
+ * Copyright 2005 BEA Systems Inc.
+ * Copyright 2005 International Business Machines Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tuscany.model.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * A list that invokes added or removed methods when elements are added or removed.
+ *
+ */
+public abstract class NotifyingList<E> extends ArrayList<E> {
+
+ private boolean frozen;
+
+ public NotifyingList() {
+ }
+
+ public void freeze() {
+ frozen=true;
+ }
+
+ protected void checkNotFrozen() {
+ if (frozen)
+ throw new IllegalStateException("Attempt to modify a frozen list");
+ }
+
+ public boolean add(E element) {
+ checkNotFrozen();
+ boolean result=super.add(element);
+ added(element);
+ return result;
+ }
+
+ public void add(int index, E element) {
+ checkNotFrozen();
+ super.add(index, element);
+ added(element);
+ }
+
+ public boolean addAll(Collection<? extends E> c) {
+ checkNotFrozen();
+ boolean result=super.addAll(c);
+ for (E element : c)
+ added(element);
+ return result;
+ }
+
+ public boolean addAll(int index, Collection<? extends E> c) {
+ checkNotFrozen();
+ boolean result=super.addAll(index, c);
+ for (E element : c)
+ added(element);
+ return result;
+ }
+
+ public void clear() {
+ checkNotFrozen();
+ List<E> l=new ArrayList<E>(this);
+ super.clear();
+ for (E element : l)
+ removed(element);
+ }
+
+ public E remove(int index) {
+ checkNotFrozen();
+ E element=super.remove(index);
+ removed(element);
+ return element;
+ }
+
+ public boolean remove(Object element) {
+ checkNotFrozen();
+ boolean result=super.remove(element);
+ removed((E)element);
+ return result;
+ }
+
+ public boolean removeAll(Collection<?> c) {
+ checkNotFrozen();
+ boolean result=super.removeAll(c);
+ for (E element : (Collection<? extends E>)c)
+ removed(element);
+ return result;
+ }
+
+ protected abstract void added(E element);
+
+ protected abstract void removed(E element);
+
+}
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/model/src/main/java/org/apache/tuscany/model/util/NotifyingList.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java Tue Apr 11 03:05:02 2006
@@ -40,7 +40,7 @@
import org.apache.tuscany.core.context.EventException;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
@@ -121,7 +121,7 @@
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
- AssemblyModelContext modelContext = new AssemblyModelContextImpl(modelFactory, modelLoader, resourceLoader);
+ AssemblyContext modelContext = new AssemblyModelContextImpl(modelFactory, modelLoader, resourceLoader);
ModuleComponentConfigurationLoader loader = BootstrapHelper.getConfigurationLoader(runtime.getSystemContext(), modelContext);
Modified: incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java Tue Apr 11 03:05:02 2006
@@ -36,7 +36,7 @@
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.runtime.RuntimeContextImpl;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
@@ -69,7 +69,7 @@
private void startRuntime() {
// Create an assembly model context
- AssemblyModelContext modelContext = BootstrapHelper.getModelContext(getClass().getClassLoader());
+ AssemblyContext modelContext = BootstrapHelper.getModelContext(getClass().getClassLoader());
modelFactory = modelContext.getAssemblyFactory();
modelLoader = modelContext.getAssemblyLoader();
Modified: incubator/tuscany/sandbox/sebastien/java/sca/tools/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/sebastien/java/sca/tools/pom.xml?rev=393172&r1=393131&r2=393172&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/tools/pom.xml Tue Apr 11 03:05:02 2006
@@ -100,17 +100,33 @@
</dependency>
<dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>0.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>ws-commons</groupId>
<artifactId>policy</artifactId>
<version>1.0</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-api</artifactId>
<version>0.95</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-impl</artifactId>