incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1022575 - in /incubator/aries/trunk/application/application-deployment-management/src: main/resources/org/apache/aries/application/deployment/management/messages/ test/java/org/apache/aries/application/deployment/management/
Date Thu, 14 Oct 2010 15:16:40 GMT
Author: mnuttall
Date: Thu Oct 14 15:16:40 2010
New Revision: 1022575

URL: http://svn.apache.org/viewvc?rev=1022575&view=rev
Log:
ARIES-459: Fix build break

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-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.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=1022575&r1=1022574&r2=1022575&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 15:16:40 2010
@@ -17,7 +17,7 @@
 # under the License.
 #
 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} 
+SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLES=Shared bundle {0} has a dependency for package
{1} which is exported from application bundles {2} 
 
 SUSPECTED_CIRCULAR_DEPENDENCIES=Resolution of asset {0} indicates invalid dependencies of
shared content on application content: {1} 
 

Modified: incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java?rev=1022575&r1=1022574&r2=1022575&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java
(original)
+++ incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java
Thu Oct 14 15:16:40 2010
@@ -300,7 +300,7 @@ public class DeploymentGeneratorTest
       List<String> usr = rx.getUnsatisfiedRequirements();
       assertEquals ("One unsatisfied requirement expected, not " + usr.size(), usr.size(),
1);
       String chkMsg = "Shared bundle test.shared_1.0.0 has a dependency for package " +
-      		"test.shared which is exported from isolated bundle [test.isolated_1.0.0]";
+      		"test.shared which is exported from application bundle [test.isolated_1.0.0]";
       assertTrue (chkMsg + " expected, not " + usr, usr.contains(chkMsg));
       return;
     }
@@ -357,13 +357,13 @@ public class DeploymentGeneratorTest
       List<String> checkMessages = new ArrayList<String>();
       // Now load an array with the expected messages.
       checkMessages.add("Shared bundle test.shared1_1.0.0 has a dependency for package test.isolated1
which " +
-      "is exported from isolated bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
+      "is exported from application bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
       checkMessages.add("Shared bundle test.shared1_1.0.0 has a dependency for package test.isolated2
which " +
-      "is exported from isolated bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
+      "is exported from application bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
       checkMessages.add("Shared bundle test.shared2_1.0.0 has a dependency for package test.isolated1
which " +
-      "is exported from isolated bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
+      "is exported from application bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
       checkMessages.add("Shared bundle test.shared2_1.0.0 has a dependency for package test.isolated2
which " +
-      "is exported from isolated bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
+      "is exported from application bundles [test.isolated1_1.0.0, test.isolated2_1.0.0]");
       
       // Loop through the unsatisfied Requirements and compare them to the expected msgs.
We trim the strings
       // because some unsatisfied reqs have spaces at the end of the string.



Mime
View raw message