Author: slaws
Date: Tue Jan 29 06:54:08 2008
New Revision: 616357
URL: http://svn.apache.org/viewvc?rev=616357&view=rev
Log:
Add contributions into the model
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/Constants.java
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/DomainProcessor.java
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/test/resources/org/apache/tuscany/sca/domain/model/xml/test.domain
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Domain.java
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/DomainFactory.java
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Node.java
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainImpl.java
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainlFactoryImpl.java
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/Constants.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/Constants.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/Constants.java
Tue Jan 29 06:54:08 2008
@@ -34,5 +34,9 @@
String COMPOSITE = "composite";
QName COMPOSITE_QNAME = new
QName(org.apache.tuscany.sca.assembly.xml.Constants.SCA10_TUSCANY_NS,
COMPOSITE);
+
+ String CONTRIBUTION = "contribution";
+ QName CONTRIBUTION_QNAME = new
QName(org.apache.tuscany.sca.assembly.xml.Constants.SCA10_TUSCANY_NS,
COMPOSITE);
+
}
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/DomainProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/DomainProcessor.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/DomainProcessor.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/main/java/org/apache/tuscany/sca/domain/model/xml/DomainProcessor.java
Tue Jan 29 06:54:08 2008
@@ -59,6 +59,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.domain.model.Contribution;
import org.apache.tuscany.sca.domain.model.Domain;
import org.apache.tuscany.sca.domain.model.DomainFactory;
import org.apache.tuscany.sca.domain.model.Node;
@@ -99,6 +100,7 @@
public Domain read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
Domain domain = null;
Node node = null;
+ Contribution contribution = null;
QName name;
@@ -127,7 +129,14 @@
// Read a <composite>
QName compositeQName = getQName(reader,
org.apache.tuscany.sca.assembly.xml.Constants.NAME);
node.setCompositeName(compositeQName);
- }
+ } else if (CONTRIBUTION_QNAME.equals(name)) {
+
+ // Read a <contribution>
+ contribution = domainFactory.createContribution();
+ contribution.setContributionName(getString(reader,
org.apache.tuscany.sca.assembly.xml.Constants.NAME));
+ domain.getContributions().add(contribution);
+ }
+
break;
case XMLStreamConstants.CHARACTERS:
@@ -139,7 +148,9 @@
// Clear current state when reading end element
if (NODE_QNAME.equals(name)) {
node = null;
- }
+ } else if (CONTRIBUTION_QNAME.equals(name)) {
+ contribution = null;
+ }
break;
}
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/test/resources/org/apache/tuscany/sca/domain/model/xml/test.domain
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/test/resources/org/apache/tuscany/sca/domain/model/xml/test.domain?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/test/resources/org/apache/tuscany/sca/domain/model/xml/test.domain
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model-xml/src/test/resources/org/apache/tuscany/sca/domain/model/xml/test.domain
Tue Jan 29 06:54:08 2008
@@ -20,12 +20,17 @@
<domain xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
targetNamespace="http://test";
xmlns:test="http://test";
- uri="http://localhost:8080/domainA";>
+ uri="http://localhost:8080/domainA";
+ respository="repository">
<node uri="nodeA">
<composite name="test:compositeA"/>
+ <!-- TODO
<bindingConfiguration name="binding.ws">
<baseURI>http://localhost:8081/nodeA</baseURI>
</bindingConfiguration>
+ -->
</node>
+
+ <contribution name="sample-calculator.jar"/>
</domain>
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Domain.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Domain.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Domain.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Domain.java
Tue Jan 29 06:54:08 2008
@@ -57,5 +57,12 @@
* @return list of nodes in the domain
*/
public List<Node> getNodes();
+
+ /**
+ * Returns a list of contributions that are part of this domain
+ *
+ * @return list of contributions in the domain
+ */
+ public List<Contribution> getContributions();
}
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/DomainFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/DomainFactory.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/DomainFactory.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/DomainFactory.java
Tue Jan 29 06:54:08 2008
@@ -39,5 +39,12 @@
* @return new node model
*/
public Node createNode();
+
+ /**
+ * Create a new contribution model
+ *
+ * @return new contribution model
+ */
+ public Contribution createContribution();
}
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Node.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Node.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/Node.java
Tue Jan 29 06:54:08 2008
@@ -33,7 +33,6 @@
* @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007)
$
*/
public interface Node {
- public enum LifecyleState {AVAILABLE, DEPLOYED, RUNNING, UNAVAILABLE };
/**
* Retrieve the node uri
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainImpl.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainImpl.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainImpl.java
Tue Jan 29 06:54:08 2008
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.domain.model.Contribution;
import org.apache.tuscany.sca.domain.model.Domain;
import org.apache.tuscany.sca.domain.model.Node;
@@ -38,7 +39,8 @@
public class DomainImpl implements Domain {
private String domainURI;
- private List<Node> nodes = new ArrayList<Node>();
+ private List<Node> nodes = new ArrayList<Node>();
+ private List<Contribution> contributions = new ArrayList<Contribution>();
public String getDomainURI(){
return domainURI;
@@ -50,5 +52,9 @@
public List<Node> getNodes(){
return nodes;
+ }
+
+ public List<Contribution> getContributions(){
+ return contributions;
}
}
Modified:
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainlFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainlFactoryImpl.java?rev=616357&r1=616356&r2=616357&view=diff
==============================================================================
---
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainlFactoryImpl.java
(original)
+++
incubator/tuscany/sandbox/slaws/modules/domain-model/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainlFactoryImpl.java
Tue Jan 29 06:54:08 2008
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.domain.model.impl;
+import org.apache.tuscany.sca.domain.model.Contribution;
import org.apache.tuscany.sca.domain.model.Domain;
import org.apache.tuscany.sca.domain.model.DomainFactory;
import org.apache.tuscany.sca.domain.model.Node;
@@ -37,5 +38,9 @@
public Node createNode(){
return new NodeImpl();
}
+
+ public Contribution createContribution(){
+ return new ContributionImpl();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
