Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6810B10AAF for ; Thu, 17 Apr 2014 14:12:22 +0000 (UTC) Received: (qmail 42165 invoked by uid 500); 17 Apr 2014 14:12:20 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 42121 invoked by uid 500); 17 Apr 2014 14:12:19 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 42113 invoked by uid 99); 17 Apr 2014 14:12:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 14:12:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 14:12:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4CD82388B34; Thu, 17 Apr 2014 14:11:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588265 [3/3] - in /aries/branches/subsystemsR6/subsystem: subsystem-api/ subsystem-api/src/main/java/org/apache/aries/subsystem/ subsystem-api/src/main/java/org/osgi/service/subsystem/ subsystem-bundle/ subsystem-core/ subsystem-core/src/... Date: Thu, 17 Apr 2014 14:11:55 -0000 To: commits@aries.apache.org From: jwross@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140417141157.C4CD82388B34@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java?rev=1588265&r1=1588264&r2=1588265&view=diff ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java (original) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java Thu Apr 17 14:11:53 2014 @@ -117,7 +117,7 @@ public class RootSubsystemTest extends S core.stop(); assertServiceEventsStop(root); core.uninstall(); - core = bundleContext.installBundle(core.getLocation()); + core = bundleContext.installBundle(normalizeBundleLocation(core)); core.start(); // There should be install events since the persisted root subsystem was // deleted when the subsystems implementation bundle was uninstalled. Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1588265&r1=1588264&r2=1588265&view=diff ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java (original) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java Thu Apr 17 14:11:53 2014 @@ -75,7 +75,6 @@ import org.osgi.framework.wiring.BundleR import org.osgi.framework.wiring.FrameworkWiring; import org.osgi.resource.Resource; import org.osgi.service.repository.Repository; -import org.osgi.service.repository.RepositoryContent; import org.osgi.service.subsystem.Subsystem; import org.osgi.service.subsystem.Subsystem.State; import org.osgi.service.subsystem.SubsystemConstants; @@ -206,11 +205,11 @@ public abstract class SubsystemTest exte mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.coordinator").version("1.1.0.v20120522-1841"), mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.event").version("1.2.200.v20120522-2049"), mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.region").version("1.1.0.v20120522-1841"), - mavenBundle("org.osgi", "org.osgi.enterprise").version("5.0.0"), + mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(), mavenBundle("org.easymock", "easymock").versionAsInProject(), // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"), PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"), - equinox().version("3.8.0.V20120529-1548") + equinox().version("3.10.0.V20131210-2136") }; } @@ -596,11 +595,11 @@ public abstract class SubsystemTest exte write(symbolicName, bundle); } - protected RepositoryContent createBundleRepositoryContent(String file) throws Exception { + protected Resource createBundleRepositoryContent(String file) throws Exception { return createBundleRepositoryContent(new File(file)); } - protected RepositoryContent createBundleRepositoryContent(File file) throws Exception { + protected Resource createBundleRepositoryContent(File file) throws Exception { return new BundleResource(FileSystem.getFSRoot(file)); } @@ -1007,6 +1006,10 @@ public abstract class SubsystemTest exte } } + protected static String normalizeBundleLocation(Bundle bundle) { + return normalizeBundleLocation(bundle.getLocation()); + } + protected static String normalizeBundleLocation(String location) { if (location.startsWith("initial@")) return location.substring(8); Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java?rev=1588265&r1=1588264&r2=1588265&view=diff ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java (original) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java Thu Apr 17 14:11:53 2014 @@ -102,7 +102,7 @@ public class UnmanagedBundleTest extends try { Bundle a = bundleContext.installBundle(BUNDLE_A, new FileInputStream(BUNDLE_A)); try { - core = bundleContext.installBundle(core.getLocation()); + core = bundleContext.installBundle(normalizeBundleLocation(core)); core.start(); assertConstituent(getRootSubsystem(), BUNDLE_A); } @@ -112,7 +112,7 @@ public class UnmanagedBundleTest extends } finally { if (core.getState() == Bundle.UNINSTALLED) { - core = bundleContext.installBundle(core.getLocation()); + core = bundleContext.installBundle(normalizeBundleLocation(core)); core.start(); } } Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1588265&r1=1588264&r2=1588265&view=diff ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java (original) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java Thu Apr 17 14:11:53 2014 @@ -42,6 +42,7 @@ public class SsActivator extends Abstrac new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20110621" ), new EquinoxPlatformBuilder( bundleContext, "3.8.0-SNAPSHOT" ), new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20120529-1548"), + new EquinoxPlatformBuilder( bundleContext, "3.10.0.V20131210-2136"), new EquinoxPlatformBuilderSnapshot( bundleContext ) }; } Added: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.10.0.V20131210-2136.xml URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.10.0.V20131210-2136.xml?rev=1588265&view=auto ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.10.0.V20131210-2136.xml (added) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.10.0.V20131210-2136.xml Thu Apr 17 14:11:53 2014 @@ -0,0 +1,8 @@ + + + Equinox 3.10.0 + mvn:org.eclipse/org.eclipse.osgi/3.10.0.v20131210-2136 + + + + \ No newline at end of file Propchange: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.10.0.V20131210-2136.xml ------------------------------------------------------------------------------ svn:executable = * Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/ss-runner.properties URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/ss-runner.properties?rev=1588265&r1=1588264&r2=1588265&view=diff ============================================================================== --- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/ss-runner.properties (original) +++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/ss-runner.properties Thu Apr 17 14:11:53 2014 @@ -68,6 +68,7 @@ platform.equinox.3.7.0.V20110221=org.ops platform.equinox.3.8.0.V20110621=org.ops4j.pax.runner.platform.equinox.internal.SsActivator platform.equinox.3.8.0-SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator platform.equinox.3.8.0.V20120529-1548=org.ops4j.pax.runner.platform.equinox.internal.SsActivator +platform.equinox.3.10.0.V20131210-2136=org.ops4j.pax.runner.platform.equinox.internal.SsActivator # Felix platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator