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:16:29 UTC
svn commit: r911412 - in /incubator/aries/trunk/application:
application-api/src/main/java/org/apache/aries/application/management/
application-management/src/test/java/org/apache/aries/application/management/impl/
application-obr-resolver/src/main/jav...
Author: gnodet
Date: Thu Feb 18 14:16:28 2010
New Revision: 911412
URL: http://svn.apache.org/viewvc?rev=911412&view=rev
Log:
ARIES-181: AriesApplicationManager has a resolve method that can be passed resolve constraints, but you cannot pass them to the AriesApplicationResolver
Modified:
incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java
incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java
Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java?rev=911412&r1=911411&r2=911412&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java Thu Feb 18 14:16:28 2010
@@ -32,7 +32,7 @@
* set will not include those provided by value within the application.
* @throws ResolverException if the application cannot be resolved.
*/
- Set<BundleInfo> resolve (AriesApplication app) throws ResolverException ;
+ Set<BundleInfo> resolve (AriesApplication app, ResolveConstraint... constraints) throws ResolverException ;
/**
* Return the info for the requested bundle. If no matching bundle exists in the
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=911412&r1=911411&r2=911412&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:16:28 2010
@@ -49,6 +49,7 @@
import org.apache.aries.application.management.BundleInfo;
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.impl.AriesApplicationManagerImpl;
import org.apache.aries.application.management.impl.BundleInfoImpl;
import org.apache.aries.application.utils.filesystem.FileSystem;
@@ -68,7 +69,7 @@
static class DummyResolver implements AriesApplicationResolver {
Set<BundleInfo> nextResult;
- public Set<BundleInfo> resolve(AriesApplication app) {
+ public Set<BundleInfo> resolve(AriesApplication app, ResolveConstraint... constraints) {
return nextResult;
}
void setNextResult (Set<BundleInfo> r) {
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=911412&r1=911411&r2=911412&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 Feb 18 14:16:28 2010
@@ -31,6 +31,7 @@
import org.apache.aries.application.management.AriesApplication;
import org.apache.aries.application.management.AriesApplicationResolver;
import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.management.ResolveConstraint;
import org.apache.aries.application.management.ResolverException;
import org.apache.aries.application.resolver.obr.impl.ApplicationResourceImpl;
import org.apache.aries.application.resolver.obr.impl.OBRBundleInfo;
@@ -57,7 +58,7 @@
this.repositoryAdmin = repositoryAdmin;
}
- public Set<BundleInfo> resolve(AriesApplication app) throws ResolverException
+ public Set<BundleInfo> resolve(AriesApplication app, ResolveConstraint... constraints) throws ResolverException
{
log.trace("resolving {}", app);
Resolver obrResolver = repositoryAdmin.resolver();
Modified: incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java?rev=911412&r1=911411&r2=911412&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java (original)
+++ incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java Thu Feb 18 14:16:28 2010
@@ -23,6 +23,7 @@
import org.apache.aries.application.management.AriesApplication;
import org.apache.aries.application.management.AriesApplicationResolver;
import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.management.ResolveConstraint;
import org.osgi.framework.Version;
/** AriesApplicationManager requires that there be at least one
@@ -33,7 +34,7 @@
*/
public class NoOpResolver implements AriesApplicationResolver {
- public Set<BundleInfo> resolve(AriesApplication app) {
+ public Set<BundleInfo> resolve(AriesApplication app, ResolveConstraint... constraints) {
return app.getBundleInfo();
}