You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/16 20:57:14 UTC
svn commit: r519116 [2/2] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/services/deployment/
core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/
core/src/main/java/org/apache/tuscany/core/u...
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java?view=diff&rev=519116&r1=519115&r2=519116
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java Fri Mar 16 12:57:12 2007
@@ -40,26 +40,38 @@
protected List<String> exports = new ArrayList<String>();
protected List<ContributionImport> imports = new ArrayList<ContributionImport>();
- protected List<QName> runnables = new ArrayList<QName>();
+ protected List<QName> deployables = new ArrayList<QName>();
/**
* A list of artifacts in the contribution
*/
protected Map<URI, DeployedArtifact> artifacts = new HashMap<URI, DeployedArtifact>();
+ public Contribution() {
+ super();
+ }
/**
* @param uri
*/
public Contribution(URI uri) {
super(uri);
- artifacts.put(uri, this);
+ if (uri != null) {
+ artifacts.put(uri, this);
+ }
}
public URI getUri() {
return uri;
}
+ public void setURI(URI uri) {
+ super.setUri(uri);
+ if (uri != null) {
+ artifacts.put(uri, this);
+ }
+ }
+
public List<String> getExports() {
return exports;
}
@@ -68,8 +80,8 @@
return imports;
}
- public List<QName> getRunnables() {
- return runnables;
+ public List<QName> getDeployables() {
+ return deployables;
}
public Map<URI, DeployedArtifact> getArtifacts() {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java?view=diff&rev=519116&r1=519115&r2=519116
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java Fri Mar 16 12:57:12 2007
@@ -31,15 +31,18 @@
*/
public class DeployedArtifact extends ModelObject {
protected Contribution contribution;
- protected final URI uri;
+ protected URI uri;
protected URL location;
/**
- * The map keeps all the model objects loaded/introspected from this artifact. The objects are keyed by the java
- * type of the model such as javax.wsdl.ModelObject. The value is also a map with namespace as the key and the model
- * object as the value.
+ * The map keeps all the model objects loaded/introspected from this artifact. The objects
+ * are keyed by the java type of the model such as javax.wsdl.ModelObject. The value is also
+ * a map with namespace as the key and the model object as the value.
*/
protected Map<Class, Map<String, Object>> modelObjects = new HashMap<Class, Map<String, Object>>();
+ public DeployedArtifact() {
+ super();
+ }
/**
* @param uri the artifact uri
*/
@@ -47,6 +50,31 @@
super();
this.uri = uri;
}
+ /**
+ * Get the absolute URI as the unique id for the artifact
+ * @return
+ */
+ public URI getUri() {
+ return uri;
+ }
+
+ public void setUri(URI uri) {
+ this.uri = uri;
+ }
+
+ /**
+ * @return the location
+ */
+ public URL getLocation() {
+ return location;
+ }
+
+ /**
+ * @param location the location to set
+ */
+ public void setLocation(URL location) {
+ this.location = location;
+ }
public Contribution getContribution() {
return contribution;
@@ -55,16 +83,6 @@
public void setContribution(Contribution contribution) {
this.contribution = contribution;
}
-
- /**
- * Get the absolute URI as the unique id for the artifact
- *
- * @return the uri for the artifact
- */
- public URI getUri() {
- return uri;
- }
-
public Map<Class, Map<String, Object>> getModelObjects() {
return modelObjects;
}
@@ -89,20 +107,6 @@
modelObjects.put(type, map);
}
map.put(namespace, modelObject);
- }
-
- /**
- * @return the location
- */
- public URL getLocation() {
- return location;
- }
-
- /**
- * @param location the location to set
- */
- public void setLocation(URL location) {
- this.location = location;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org