You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2010/02/18 15:48:36 UTC
svn commit: r911424 - in
/incubator/aries/trunk/application/application-management/src:
main/java/org/apache/aries/application/management/impl/
test/java/org/apache/aries/application/management/impl/
Author: gnodet
Date: Thu Feb 18 14:48:35 2010
New Revision: 911424
URL: http://svn.apache.org/viewvc?rev=911424&view=rev
Log:
ARIES-182: forgot to actually remove the resolution from createApplication()
Modified:
incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java?rev=911424&r1=911423&r2=911424&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java Thu Feb 18 14:48:35 2010
@@ -133,11 +133,13 @@
} finally {
IOUtils.close(out);
}
- try {
- out = IOUtils.getOutputStream(tempDir, AppConstants.DEPLOYMENT_MF);
- _deploymentMetadata.store(out);
- } finally {
- IOUtils.close(out);
+ if (_deploymentMetadata != null) {
+ try {
+ out = IOUtils.getOutputStream(tempDir, AppConstants.DEPLOYMENT_MF);
+ _deploymentMetadata.store(out);
+ } finally {
+ IOUtils.close(out);
+ }
}
// Write the by-value eba files out
Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java?rev=911424&r1=911423&r2=911424&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java Thu Feb 18 14:48:35 2010
@@ -176,19 +176,12 @@
}
application = new AriesApplicationImpl (applicationMetadata, extraBundlesInfo, _localPlatform);
- if (deploymentMetadata == null) {
- Set<BundleInfo> additionalBundlesRequired = _resolver.resolve(application);
- deploymentMetadata = _deploymentMetadataFactory.createDeploymentMetadata(application, additionalBundlesRequired);
- }
application.setDeploymentMetadata(deploymentMetadata);
// Store a reference to any modified bundles
application.setModifiedBundles (modifiedBundles);
} catch (IOException iox) {
_logger.error ("APPMANAGEMENT0006E", new Object []{ebaFile.getName(), iox});
throw new ManagementException(iox);
- } catch (ResolverException rx) {
- _logger.error ("APPMANAGEMENT0008E", new Object []{ebaFile.getName(), rx});
- throw new ManagementException(rx);
}
return application;
}
Modified: incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java?rev=911424&r1=911423&r2=911424&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java (original)
+++ incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java Thu Feb 18 14:48:35 2010
@@ -50,6 +50,7 @@
import org.apache.aries.application.management.LocalPlatform;
import org.apache.aries.application.management.ManagementException;
import org.apache.aries.application.management.ResolveConstraint;
+import org.apache.aries.application.management.ResolverException;
import org.apache.aries.application.management.impl.AriesApplicationManagerImpl;
import org.apache.aries.application.management.impl.BundleInfoImpl;
import org.apache.aries.application.utils.filesystem.FileSystem;
@@ -142,7 +143,7 @@
DeploymentMetadata dm = app.getDeploymentMetadata();
List<DeploymentContent> dcList = dm.getApplicationDeploymentContents();
-
+
assertEquals (dcList.size(), 3);
DeploymentContent dc1 = new DeploymentContentImpl ("foo.bar.widgets;deployed-version=1.0.0");
DeploymentContent dc2 = new DeploymentContentImpl ("my.business.logic;deployed-version=1.0.0");
@@ -150,7 +151,7 @@
assertTrue (dcList.contains(dc1));
assertTrue (dcList.contains(dc2));
assertTrue (dcList.contains(dc3));
-
+
}
@Test
@@ -185,7 +186,7 @@
assertEquals (dm.getApplicationVersion(), app.getApplicationMetadata().getApplicationVersion());
}
- private AriesApplication createApplication (String fileName) throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException, ManagementException {
+ private AriesApplication createApplication (String fileName) throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException, ManagementException, ResolverException {
// This next block is a very long winded way of constructing a BundleInfoImpl
// against the existing (BundleManifest bm, String location) constructor. If we
// find we need a String-based BundleInfoImpl constructor for other reasons,
@@ -203,6 +204,7 @@
IDirectory testEba = FileSystem.getFSRoot(new File(TEST_EBA));
AriesApplication app = _appMgr.createApplication(testEba);
+ app = _appMgr.resolve(app);
return app;
}
}