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/10/19 07:51:17 UTC
svn commit: r586271 - in /incubator/tuscany/java/sca:
itest/component-type/src/main/java/calculator/
modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/
samples/
Author: lresende
Date: Thu Oct 18 22:51:16 2007
New Revision: 586271
URL: http://svn.apache.org/viewvc?rev=586271&view=rev
Log:
Fixing componentType issue in Ubuntu
Modified:
incubator/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/samples/pom.xml
Modified: incubator/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java?rev=586271&r1=586270&r2=586271&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java Thu Oct 18 22:51:16 2007
@@ -32,22 +32,18 @@
private MultiplyService multiplyService;
private DivideService divideService;
- @Reference
public void setAddService(AddService addService) {
this.addService = addService;
}
- @Reference
public void setSubtractService(SubtractService subtractService) {
this.subtractService = subtractService;
}
- @Reference
public void setDivideService(DivideService divideService) {
this.divideService = divideService;
}
- @Reference
public void setMultiplyService(MultiplyService multiplyService) {
this.multiplyService = multiplyService;
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?rev=586271&r1=586270&r2=586271&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Thu Oct 18 22:51:16 2007
@@ -389,15 +389,31 @@
* @throws ContributionException
*/
@SuppressWarnings("unchecked")
- private void processResolvePhase(Contribution contribution) throws ContributionException {
+ private void processResolvePhase(Contribution contribution) throws ContributionException {
+ List<DeployedArtifact> composites = new ArrayList<DeployedArtifact>();
+
// for each artifact that was processed on the contribution
for (DeployedArtifact artifact : contribution.getArtifacts()) {
+ //leave the composites to be resolved at the end
+ if(artifact.getURI().endsWith(".composite")) {
+ composites.add(artifact);
+ } else {
+ // resolve the model object
+ if (artifact.getModel() != null) {
+ this.artifactProcessor.resolve(artifact.getModel(), contribution.getModelResolver());
+ }
+ }
+ }
+
+ //process each composite file
+ for(DeployedArtifact artifact : composites) {
// resolve the model object
if (artifact.getModel() != null) {
+ System.out.println("Processing Resolve Phase : " + artifact.getURI() );
this.artifactProcessor.resolve(artifact.getModel(), contribution.getModelResolver());
}
}
-
+
//resolve deployables from contribution metadata
List<Composite> resolvedDeployables = new ArrayList<Composite>();
for (Composite deployableComposite : contribution.getDeployables()) {
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?rev=586271&r1=586270&r2=586271&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Thu Oct 18 22:51:16 2007
@@ -55,9 +55,7 @@
<!--module>domain-webapp</module-->
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
- <!--
<module>helloworld-bpel</module>
- -->
<module>helloworld-dojo-webapp</module>
<module>helloworld-jsonrpc-webapp</module>
<module>helloworld-ws-service</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org