Author: slaws
Date: Mon Nov 26 08:27:19 2007
New Revision: 598334
URL: http://svn.apache.org/viewvc?rev=598334&view=rev
Log:
Fill in getDomainLevelComposite()
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java?rev=598334&r1=598333&r2=598334&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
Mon Nov 26 08:27:19 2007
@@ -613,8 +613,34 @@
}
public String getDomainLevelComposite() throws DomainException {
- // TODO
- return null;
+
+ String domainLevelComposite = "<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\""; +
+ "
targetNamespace=\"http://tuscany.apache.org/domain\""; +
+ "
xmlns:domain=\"http://tuscany.apache.org/domain\"";;
+
+ int includeCount = 0;
+ for (CompositeModel compositeModel :
domainModel.getDeployedComposites().values()){
+ domainLevelComposite = domainLevelComposite + " xmlns:include" +
+ includeCount +
+ "=\"" +
compositeModel.getCompositeQName().getNamespaceURI() + "\"";
+ includeCount++;
+ }
+
+ domainLevelComposite = domainLevelComposite + "
name=\"DomainLevelComposite\">";
+
+ includeCount = 0;
+ for (CompositeModel compositeModel :
domainModel.getDeployedComposites().values()){
+ domainLevelComposite = domainLevelComposite + "<include
name=\"include" +
+ includeCount +
+ ":" +
+
compositeModel.getCompositeQName().getLocalPart() +
+ "\"/>";
+ includeCount++;
+ }
+
+ domainLevelComposite = domainLevelComposite + "</composite>";
+
+ return domainLevelComposite;
}
public String getQNameDefinition(QName artifact) throws DomainException {
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java?rev=598334&r1=598333&r2=598334&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
Mon Nov 26 08:27:19 2007
@@ -131,6 +131,9 @@
domain.startComposite(new QName("http://sample";, "CalculatorA"));
domain.startComposite(new QName("http://sample";, "CalculatorB"));
+ Assert.assertEquals("<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
targetNamespace=\"http://tuscany.apache.org/domain\";
xmlns:domain=\"http://tuscany.apache.org/domain\";
xmlns:include0=\"http://sample\"; xmlns:include1=\"http://sample\";
name=\"DomainLevelComposite\"><include name=\"include0:CalculatorA\"/><include
name=\"include1:CalculatorB\"/></composite>",
+ domain.getDomainLevelComposite());
+
calculatorService = domain.getService(CalculatorService.class,
"CalculatorServiceComponentA");
Assert.assertEquals(calculatorService.add(3, 2), 5.0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
