incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1022543 - in /incubator/aries/trunk/application: application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/ application-obr-resolver/src/main/java/org/apache/aries/application/resolver...
Date Thu, 14 Oct 2010 14:20:09 GMT
Author: mnuttall
Date: Thu Oct 14 14:20:09 2010
New Revision: 1022543

URL: http://svn.apache.org/viewvc?rev=1022543&view=rev
Log:
ARIES-459: Improve the error message for resolver exception. Patch by Emily Jiang. 

Modified:
    incubator/aries/trunk/application/application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/DeploymentManagementMessages.properties
    incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java

Modified: incubator/aries/trunk/application/application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/DeploymentManagementMessages.properties
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/DeploymentManagementMessages.properties?rev=1022543&r1=1022542&r2=1022543&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/DeploymentManagementMessages.properties
(original)
+++ incubator/aries/trunk/application/application-deployment-management/src/main/resources/org/apache/aries/application/deployment/management/messages/DeploymentManagementMessages.properties
Thu Oct 14 14:20:09 2010
@@ -16,11 +16,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLE=Shared bundle {0} has a dependency for package
{1} which is exported from isolated bundle {2}
-SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLES=Shared bundle {0} has a dependency for package
{1} which is exported from isolated bundles {2} 
+SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLE=Shared bundle {0} has a dependency for package
{1} which is exported from application bundle {2}
+SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLES=Shared bundle {0} has a dependency for package
{1} which is exported from aplication bundles {2} 
 
-
-SUSPECTED_CIRCULAR_DEPENDENCIES=Resolution of asset {0} indicates invalid dependencies of
shared content on isolated content: {1} 
+SUSPECTED_CIRCULAR_DEPENDENCIES=Resolution of asset {0} indicates invalid dependencies of
shared content on application content: {1} 
 
 EMPTY_DEPLOYMENT_CONTENT=Enterprise application {0} contains no content. 
-POST_RESOLVE_TRANSFORMER_UNAVAILABLE=An instance of the PostResolveTransformer was injected
earlier but is currently inaccessible. Exception: {0}
\ No newline at end of file
+POST_RESOLVE_TRANSFORMER_UNAVAILABLE=An instance of the PostResolveTransformer was injected
earlier but is currently inaccessible. Exception: {0}

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java?rev=1022543&r1=1022542&r2=1022543&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
Thu Oct 14 14:20:09 2010
@@ -564,9 +564,6 @@ public class OBRAriesResolver implements
       inserts.add(filter);
     }
 
-    if (!unknownType && !customAttrs.isEmpty()) {
-      inserts.add(customAttrs);    
-    }
     if (bundlesFailing != null && bundlesFailing.size() != 0) {
       msgKey.append("_REQUIRED_BY_BUNDLE");
       if (bundlesFailing.size() == 1)
@@ -576,6 +573,7 @@ public class OBRAriesResolver implements
     }
     if (!unknownType && !customAttrs.isEmpty()) {
       msgKey.append("_WITH_ATTRS");
+      inserts.add(customAttrs);
     }
 
     if (!unknownType && attrs.containsKey(Constants.VERSION_ATTRIBUTE)) {



Mime
View raw message