aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject svn commit: r1066461 - in /aries/trunk/subsystem: ./ subsystem-core/ subsystem-itests/ subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/ subsystem-itests/src...
Date Wed, 02 Feb 2011 13:25:15 GMT
Author: gcc
Date: Wed Feb  2 13:25:14 2011
New Revision: 1066461

URL: http://svn.apache.org/viewvc?rev=1066461&view=rev
Log:
ARIES-561
Removed references to old composite bundle prototype in Eclipse and moved up to a later driver
of Eclipse 3.7

Added:
    aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
    aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
Removed:
    aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20100910.xml
    aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-V43PROTOTYPE-3.6.0.201003231329.xml
    aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20100910.xml
    aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-V43PROTOTYPE-3.6.0.201003231329.xml
Modified:
    aries/trunk/subsystem/pom.xml
    aries/trunk/subsystem/subsystem-core/pom.xml
    aries/trunk/subsystem/subsystem-itests/pom.xml
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SimpleExecutorTest.java
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdmin2Test.java
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
    aries/trunk/subsystem/subsystem-itests/src/test/resources/ss-runner.properties
    aries/trunk/subsystem/subsystem-scope-impl/pom.xml
    aries/trunk/subsystem/subsystem-scope-itests/pom.xml
    aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
    aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
    aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
    aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties

Modified: aries/trunk/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/pom.xml?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/pom.xml (original)
+++ aries/trunk/subsystem/pom.xml Wed Feb  2 13:25:14 2011
@@ -106,11 +106,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>osgi</artifactId>
-                <version>v43prototype-3.6.0.201003231329</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.osgi.service.obr</artifactId>
                 <exclusions>

Modified: aries/trunk/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/pom.xml?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-core/pom.xml Wed Feb  2 13:25:14 2011
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.7.0.v20100910</version>
+            <version>3.7.0.v20110110</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Wed Feb  2 13:25:14 2011
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.7.0.v20100910</version>
+            <version>3.7.0.v20110110</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SimpleExecutorTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SimpleExecutorTest.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SimpleExecutorTest.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SimpleExecutorTest.java
Wed Feb  2 13:25:14 2011
@@ -82,7 +82,7 @@ public class SimpleExecutorTest extends 
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
 
-            equinox().version("v43prototype-3.6.0.201003231329")
+            equinox().version("3.7.0.v20110110")
         );
         options = updateOptions(options);
         return options;

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdmin2Test.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdmin2Test.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdmin2Test.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdmin2Test.java
Wed Feb  2 13:25:14 2011
@@ -138,7 +138,7 @@ public class SubsystemAdmin2Test extends
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
 
-            equinox().version("3.7.0.v20100910")
+            equinox().version("3.7.0.v20110110")
         );
         options = updateOptions(options);
         return options;

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
Wed Feb  2 13:25:14 2011
@@ -148,7 +148,7 @@ public class SubsystemAdminTest extends 
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
 
-            equinox().version("3.7.0.v20100910")
+            equinox().version("3.7.0.v20110110")
         );
         options = updateOptions(options);
         return options;

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
Wed Feb  2 13:25:14 2011
@@ -24,10 +24,9 @@ public class SsActivator extends Abstrac
             new EquinoxPlatformBuilder( bundleContext, "3.5.0" ),
             new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
             new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
-            new EquinoxPlatformBuilder( bundleContext, "V43PROTOTYPE-3.6.0.201003231329"
),
-            new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20100910" ),
+            new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110110" ),
             new EquinoxPlatformBuilderSnapshot( bundleContext )
         };
     }
 
-}
\ No newline at end of file
+}

Added: aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml?rev=1066461&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
(added)
+++ aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
Wed Feb  2 13:25:14 2011
@@ -0,0 +1,8 @@
+<platform>
+
+  <name>Equinox 3.7.0</name>
+  <system>mvn:org.eclipse/osgi/3.7.0.v20110110</system>
+
+  <profile name="minimal" default="true"/>
+
+</platform>

Modified: aries/trunk/subsystem/subsystem-itests/src/test/resources/ss-runner.properties
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/resources/ss-runner.properties?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/resources/ss-runner.properties (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/resources/ss-runner.properties Wed Feb
 2 13:25:14 2011
@@ -63,8 +63,7 @@ platform.equinox.3.5.0=org.ops4j.pax.run
 platform.equinox.3.5.1=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
 platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
 platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.3.7.0.V20100910=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20110110=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

Modified: aries/trunk/subsystem/subsystem-scope-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-impl/pom.xml?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-impl/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-scope-impl/pom.xml Wed Feb  2 13:25:14 2011
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.7.0.v20100910</version>
+            <version>3.7.0.v20101022</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/subsystem/subsystem-scope-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/pom.xml?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-scope-itests/pom.xml Wed Feb  2 13:25:14 2011
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.7.0.v20100910</version>
+            <version>3.7.0.v20101022</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
(original)
+++ aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
Wed Feb  2 13:25:14 2011
@@ -591,7 +591,7 @@ public class ScopeAdminTest extends Abst
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
 
-            equinox().version("3.7.0.v20100910")
+            equinox().version("3.7.0.v20101022")
         );
         options = updateOptions(options);
         return options;

Modified: aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
(original)
+++ aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeSecurityTest.java
Wed Feb  2 13:25:14 2011
@@ -387,7 +387,7 @@ public class ScopeSecurityTest extends A
 
             PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
 
-            equinox().version("3.7.0.v20100910")
+            equinox().version("3.7.0.v20101022")
         );
         options = updateOptions(options);
         return options;

Modified: aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(original)
+++ aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
Wed Feb  2 13:25:14 2011
@@ -42,10 +42,9 @@ public class SsActivator extends Abstrac
             new EquinoxPlatformBuilder( bundleContext, "3.5.0" ),
             new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
             new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
-            new EquinoxPlatformBuilder( bundleContext, "V43PROTOTYPE-3.6.0.201003231329"
),
-            new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20100910" ),
+            new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20101022" ),
             new EquinoxPlatformBuilderSnapshot( bundleContext )
         };
     }
 
-}
\ No newline at end of file
+}

Added: aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml?rev=1066461&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
(added)
+++ aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
Wed Feb  2 13:25:14 2011
@@ -0,0 +1,8 @@
+<platform>
+
+  <name>Equinox 3.7.0</name>
+  <system>mvn:org.eclipse/osgi/3.7.0.v20110110</system>
+
+  <profile name="minimal" default="true"/>
+
+</platform>

Modified: aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties?rev=1066461&r1=1066460&r2=1066461&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties (original)
+++ aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties Wed
Feb  2 13:25:14 2011
@@ -64,7 +64,7 @@ platform.equinox.3.5.1=org.ops4j.pax.run
 platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
 platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
 platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.3.7.0.V20100910=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20101022=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



Mime
View raw message