Sorry, if I wasn't clear. After applying the patch the file is empty. And I think the file meant to be svn deleted from svn instead of made empty.
Jarek On Fri, Sep 17, 2010 at 11:40 AM, Mark Nuttall <[email protected]> wrote: > Jarek, > Do you need it back? We do have a functional OBR Resolver now, which is > running across several samples and itests. > > The problem with having NoOpResolver published as a service from app.utils > was that various tests were picking it up before the higher priority, more > functional resolver service was published. > > If you need NoOpResolver, do you think there's a way that we can include it > just in the tests that require it rather than published as a service from > app.utils? > > If deleting it has caused you problems, and I should have checked first, > please accept my apologies. > > Regards, > Mark > > On 17 September 2010 16:30, Jarek Gawor <[email protected]> wrote: > >> Mark, >> >> svn delete the NoOpResolver.java file? >> >> Jarek >> >> On Fri, Sep 17, 2010 at 10:21 AM, <[email protected]> wrote: >> > Author: mnuttall >> > Date: Fri Sep 17 14:21:50 2010 >> > New Revision: 998148 >> > >> > URL: http://svn.apache.org/viewvc?rev=998148&view=rev >> > Log: >> > ARIES-410: Fix intermitted application-itest failures: patch by Emily >> Jiang >> > >> > Removed: >> > incubator/aries/trunk/blueprint/blueprint-core/maven-eclipse.xml >> > Modified: >> > >> incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java >> > >> incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java >> > >> incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml >> > >> > Modified: >> incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java >> > URL: >> http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=998148&r1=998147&r2=998148&view=diff >> > >> ============================================================================== >> > --- >> incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java >> (original) >> > +++ >> incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java >> Fri Sep 17 14:21:50 2010 >> > @@ -137,6 +137,8 @@ public class BasicAppManagerTest extends >> > mavenBundle("org.apache.aries.application", >> "org.apache.aries.application.modeller"), >> > mavenBundle("org.apache.aries.application", >> "org.apache.aries.application.management"), >> > mavenBundle("org.apache.aries.application", >> "org.apache.aries.application.runtime"), >> > + mavenBundle("org.apache.felix", >> "org.apache.felix.bundlerepository"), >> > + mavenBundle("org.apache.aries.application", >> "org.apache.aries.application.resolver.obr"), >> > mavenBundle("org.apache.aries.application", >> "org.apache.aries.application.runtime.itest.interfaces"), >> > mavenBundle("org.apache.aries", "org.apache.aries.util"), >> > mavenBundle("org.apache.aries.blueprint", >> "org.apache.aries.blueprint"), >> > >> > Modified: >> incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java >> > URL: >> http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java?rev=998148&r1=998147&r2=998148&view=diff >> > >> ============================================================================== >> > --- >> incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java >> (original) >> > +++ >> incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java >> Fri Sep 17 14:21:50 2010 >> > @@ -1,70 +0,0 @@ >> > -/* >> > - * Licensed to the Apache Software Foundation (ASF) under one >> > - * or more contributor license agreements. See the NOTICE file >> > - * distributed with this work for additional information >> > - * regarding copyright ownership. The ASF licenses this file >> > - * to you under the Apache License, Version 2.0 (the >> > - * "License"); you may not use this file except in compliance >> > - * with the License. You may obtain a copy of the License at >> > - * >> > - * http://www.apache.org/licenses/LICENSE-2.0 >> > - * >> > - * Unless required by applicable law or agreed to in writing, >> > - * software distributed under the License is distributed on an >> > - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> > - * KIND, either express or implied. See the License for the >> > - * specific language governing permissions and limitations >> > - * under the License. >> > - */ >> > -package org.apache.aries.application.utils.runtime; >> > - >> > -import java.util.Collection; >> > -import java.util.HashSet; >> > -import java.util.Set; >> > - >> > -import org.apache.aries.application.Content; >> > -import org.apache.aries.application.management.AriesApplication; >> > -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.management.spi.resolve.AriesApplicationResolver; >> > -import org.apache.aries.application.modelling.ModelledResource; >> > -import org.osgi.framework.Version; >> > - >> > -/** AriesApplicationManager requires that there be at least one >> > - * AriesApplicationResolver service present. This class provides a null >> > - * implementation: it simply returns the bundles that it was provided >> with - >> > - * enough to permit the testing of Aries applications that have no >> external >> > - * dependencies. >> > - */ >> > -public class NoOpResolver implements AriesApplicationResolver { >> > - >> > - Set<BundleInfo> resolvedBundles = new HashSet<BundleInfo>(); >> > - >> > - public Set<BundleInfo> resolve(AriesApplication app, >> ResolveConstraint... constraints) { >> > - resolvedBundles.addAll(app.getBundleInfo()); >> > - return app.getBundleInfo(); >> > - } >> > - >> > - public BundleInfo getBundleInfo(String bundleSymbolicName, Version >> bundleVersion) >> > - { >> > - BundleInfo result = null; >> > - for (BundleInfo info : resolvedBundles) >> > - { >> > - if (info.getSymbolicName().equals(bundleSymbolicName) && >> > - info.getVersion().equals(bundleVersion)) >> > - { >> > - result = info; >> > - } >> > - } >> > - return result; >> > - } >> > - >> > - public Collection<ModelledResource> resolve(String appName, String >> appVersion, >> > - Collection<ModelledResource> byValueBundles, Collection<Content> >> inputs) >> > - throws ResolverException >> > - { >> > - >> > - return byValueBundles; >> > - } >> > -} >> > \ No newline at end of file >> > >> > Modified: >> incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml >> > URL: >> http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml?rev=998148&r1=998147&r2=998148&view=diff >> > >> ============================================================================== >> > --- >> incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml >> (original) >> > +++ >> incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml >> Fri Sep 17 14:21:50 2010 >> > @@ -29,14 +29,11 @@ >> > particular application server environment follow --> >> > >> > <bean id="default-local-platform" >> class="org.apache.aries.application.utils.runtime.DefaultLocalPlatform" /> >> > - <bean id="no-op-resolver" >> class="org.apache.aries.application.utils.runtime.NoOpResolver" /> >> > - >> > + >> > <service >> interface="org.apache.aries.application.management.spi.runtime.LocalPlatform" >> > ref="default-local-platform" >> > ranking="-1" /> >> > - <service >> interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver" >> > - ref="no-op-resolver" >> > - ranking="-1" /> >> > + >> > <bean id="default-platform-repository" >> class="org.apache.aries.application.utils.runtime.DefaultPlatformRepository"/> >> > <service >> interface="org.apache.aries.application.management.spi.repository.PlatformRepository" >> ref="default-platform-repository" ranking="-1"/> >> > >> > >> > >> > >> >
