Author: antelder
Date: Tue Mar 27 12:48:47 2012
New Revision: 1305824
URL: http://svn.apache.org/viewvc?rev=1305824&view=rev
Log:
Put back the definitions as it causes some policy regressions
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1305824&r1=1305823&r2=1305824&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
Tue Mar 27 12:48:47 2012
@@ -629,24 +629,22 @@ public class DeployerImpl implements Dep
for (Contribution contribution : contributionList) {
monitor.pushContext("Contribution: " + contribution.getURI());
try {
-// For now don't aggregate definitions in resolve as that causes duplicate
definitions when build is run
-// as there is no way presently to remove aggregated definitions
-// // aggregate definitions
-// for (Artifact artifact : contribution.getArtifacts()) {
-// if
(!"META-INF/definitions.xml".equals(artifact.getURI())) {
-// continue;
-// }
-// Object model = artifact.getModel();
-// // FIXME: Should we check the artifact URI is
META-INF/definitions.xml?
-// if (model instanceof Definitions) {
-// try {
-// monitor.pushContext("Definitions: " +
artifact.getLocation());
-// DefinitionsUtil.aggregate((Definitions)model,
systemDefinitions, monitor);
-// } finally {
-// monitor.popContext();
-// }
-// }
-// }
+ // aggregate definitions
+ for (Artifact artifact : contribution.getArtifacts()) {
+ if (!"META-INF/definitions.xml".equals(artifact.getURI()))
{
+ continue;
+ }
+ Object model = artifact.getModel();
+ // FIXME: Should we check the artifact URI is
META-INF/definitions.xml?
+ if (model instanceof Definitions) {
+ try {
+ monitor.pushContext("Definitions: " +
artifact.getLocation());
+ DefinitionsUtil.aggregate((Definitions)model,
systemDefinitions, monitor);
+ } finally {
+ monitor.popContext();
+ }
+ }
+ }
// create a default import and wire it up to the system
contribution
// model resolver. This is the trick that makes the resolution
processing
