Author: rfeng
Date: Tue May 12 23:10:51 2009
New Revision: 774126
URL: http://svn.apache.org/viewvc?rev=774126&view=rev
Log:
Move node configuration to node-api
Added:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
- copied unchanged from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
- copied, changed from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
- copied unchanged from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
- copied, changed from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
- copied unchanged from r773735,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
- copied unchanged from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/
- copied from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/
Removed:
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/impl/
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/xml/
tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/node/configuration/
Modified:
tuscany/java/sca/modules/node-api/META-INF/MANIFEST.MF
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
Modified: tuscany/java/sca/modules/node-api/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/META-INF/MANIFEST.MF?rev=774126&r1=774125&r2=774126&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-api/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/node-api/META-INF/MANIFEST.MF Tue May 12 23:10:51
2009
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.node;uses:="org.oasisopen.sca";versi
- on="2.0.0"
+Export-Package:
org.apache.tuscany.sca.node;version="2.0.0";uses:="org.oasisopen.sca",
+ org.apache.tuscany.sca.node.configuration;version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Node API
Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -12,8 +12,9 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Node API
-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",org.oasisopen.sca
- ;version="2.0.0"
+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.node.configuration;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.node.api
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Copied:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
(from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java?p2=tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java&p1=tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java&r1=773715&r2=774126&rev=774126&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
(original)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
Tue May 12 23:10:51 2009
@@ -21,8 +21,6 @@
import java.util.List;
-import org.apache.tuscany.sca.contribution.Contribution;
-
/**
* Configuration for an SCA contribution used by the SCA node
*/
@@ -52,18 +50,6 @@
void setLocation(String location);
/**
- * Get the contribution
- * @return
- */
- Contribution getContribution();
-
- /**
- * Set the contribution
- * @param contribution
- */
- void setContribution(Contribution contribution);
-
- /**
* Get the list of deployment composites that are attached to the
contribution
* @return
*/
Copied:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
(from r773715,
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java?p2=tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java&p1=tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java&r1=773715&r2=774126&rev=774126&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
(original)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
Tue May 12 23:10:51 2009
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.node.configuration;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
/**
* Configuration for a deployment composite
@@ -52,27 +50,15 @@
void setContent(String compositeXML);
/**
- * Get the composite
- * @return
- */
- Composite getComposite();
-
- /**
- * Set the composite
- * @param composite
- */
- void setComposite(Composite composite);
-
- /**
- * Get the contribution that this deployment composite is attached to
- * @return
+ * Get the URI of the contribution that the deployment composite is
attached to
+ * @return the URI of the contribution that the deployment composite is
attached to
*/
- Contribution getContribution();
+ String getContributionURI();
/**
- * Set the contribution that this deployment composite is attached to
- * @param contribution
+ * Set the URI of the contribution that the deployment composite is
attached to
+ * @param contributionURI
*/
- void setContribution(Contribution contribution);
+ void setContributionURI(String contributionURI);
}
Modified:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java?rev=774126&r1=773715&r2=774126&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
(original)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
Tue May 12 23:10:51 2009
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.node.configuration.ContributionConfiguration;
import org.apache.tuscany.sca.node.configuration.DeploymentComposite;
@@ -31,17 +30,9 @@
*/
class ContributionConfigurationImpl implements ContributionConfiguration {
private List<DeploymentComposite> deploymentComposites = new
ArrayList<DeploymentComposite>();
- private Contribution contribution;
private String uri;
private String location;
- public Contribution getContribution() {
- return contribution;
- }
-
- public void setContribution(Contribution contribution) {
- this.contribution = contribution;
- }
/**
* Get the URI of the contribution
Modified:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java?rev=774126&r1=773715&r2=774126&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
(original)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
Tue May 12 23:10:51 2009
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.node.configuration.impl;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.node.configuration.DeploymentComposite;
/**
@@ -29,8 +27,7 @@
class DeploymentCompositeImpl implements DeploymentComposite {
private String location;
private String content;
- private Composite composite;
- private Contribution contribution;
+ private String contributionURI;
public String getLocation() {
return location;
@@ -48,20 +45,12 @@
this.content = content;
}
- public Composite getComposite() {
- return composite;
+ public String getContributionURI() {
+ return contributionURI;
}
- public void setComposite(Composite composite) {
- this.composite = composite;
- }
-
- public Contribution getContribution() {
- return contribution;
- }
-
- public void setContribution(Contribution contribution) {
- this.contribution = contribution;
+ public void setContributionURI(String contributionURI) {
+ this.contributionURI = contributionURI;
}
}
