You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jw...@apache.org on 2012/08/30 21:00:29 UTC
svn commit: r1379067 - in /aries/trunk/subsystem: ./ subsystem-core/
subsystem-itests/
subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/
subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/
subsystem-itests/src/test/ja...
Author: jwross
Date: Thu Aug 30 19:00:28 2012
New Revision: 1379067
URL: http://svn.apache.org/viewvc?rev=1379067&view=rev
Log:
ARIES-910: (1) Updates to poms and platform definition to match the artifacts released to maven central, (2) Ensure the repository.xml file is freshly generated before subsystem tests are executed.
Added:
aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.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/SubsystemTest.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.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
Modified: aries/trunk/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/pom.xml?rev=1379067&r1=1379066&r2=1379067&view=diff
==============================================================================
--- aries/trunk/subsystem/pom.xml (original)
+++ aries/trunk/subsystem/pom.xml Thu Aug 30 19:00:28 2012
@@ -15,118 +15,24 @@
License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0</version>
<relativePath/>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.subsystem</groupId>
<artifactId>subsystem</artifactId>
<name>Apache Aries Subsystem</name>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
-
<description>Subsystems support for Aries</description>
-
- <!--
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.scope.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.scope.impl</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.utils</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.service.obr</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.4</version>
- </dependency>
-
-
- </dependencies>
- </dependencyManagement>
- -->
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
+ </scm>
<profiles>
<profile>
<id>default</id>
@@ -139,95 +45,6 @@
<module>subsystem-itests</module>
<module>subsystem-itests-api-bundle</module>
</modules>
-
- </profile>
-
- <profile>
- <id>fetch-external</id>
- <pluginRepositories>
- <pluginRepository>
- <id>ossrh</id>
- <name>Sonatype OSS Repository</name>
- <url>http://oss.sonatype.org/content/groups/public</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
-
-
- <build>
- <plugins>
-
- <!-- EXTERNAL DEPENDENCY RESOLVER -->
-
- <plugin>
- <groupId>com.savage7.maven.plugins</groupId>
- <artifactId>maven-external-dependency-plugin</artifactId>
- <version>0.6-SNAPSHOT</version>
- <inherited>false</inherited>
- <configuration>
- <createChecksum>true</createChecksum>
- <skipChecksumVerification>false</skipChecksumVerification>
- <force>false</force>
- <artifactItems>
- <artifactItem>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.coordinator</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.8M6-201203141800/org.eclipse.equinox.coordinator_1.1.0.v20120219-1616.jar&url=http://download.eclipse.org/equinox/drops/S-3.8M6-201203141800/org.eclipse.equinox.coordinator_1.1.0.v20120219-1616.jar&mirror_id=1</downloadUrl>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.event</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.8M5-201201251800/org.eclipse.equinox.event_1.2.100.v20111010-1614.jar&url=http://download.eclipse.org/equinox/drops/S-3.8M5-201201251800/org.eclipse.equinox.event_1.2.100.v20111010-1614.jar&mirror_id=1</downloadUrl>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.region</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.8M6-201203141800/org.eclipse.equinox.region_1.1.0.v20120227-1635.jar&url=http://download.eclipse.org/equinox/drops/S-3.8M6-201203141800/org.eclipse.equinox.region_1.1.0.v20120227-1635.jar&mirror_id=1</downloadUrl>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.8M6-201203141800/org.eclipse.osgi_3.8.0.v20120312-2035.jar&url=http://download.eclipse.org/equinox/drops/S-3.8M6-201203141800/org.eclipse.osgi_3.8.0.v20120312-2035.jar&mirror_id=1</downloadUrl>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.8.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.8M5-201201251800/org.eclipse.osgi.services_3.3.0.v20111117-1210.jar&url=http://download.eclipse.org/equinox/drops/S-3.8M5-201201251800/org.eclipse.osgi.services_3.3.0.v20111117-1210.jar&mirror_id=1</downloadUrl>
- </artifactItem>
- </artifactItems>
- </configuration>
- <executions>
- <execution>
- <id>clean-external-dependencies</id>
- <phase>clean</phase>
- <goals>
- <goal>clean-external</goal>
- </goals>
- </execution>
- <execution>
- <id>resolve-install-external-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>resolve-external</goal>
- <goal>install-external</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
-
-
</project>
Modified: aries/trunk/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/pom.xml?rev=1379067&r1=1379066&r2=1379067&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-core/pom.xml Thu Aug 30 19:00:28 2012
@@ -113,12 +113,12 @@
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.coordinator</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>1.1.0.v20120522-1841</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.region</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>1.1.0.v20120522-1841</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1379067&r1=1379066&r2=1379067&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Thu Aug 30 19:00:28 2012
@@ -194,7 +194,7 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.event</artifactId>
<scope>test</scope>
- <version>3.8.0-SNAPSHOT</version>
+ <version>1.2.200.v20120522-2049</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1379067&r1=1379066&r2=1379067&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java Thu Aug 30 19:00:28 2012
@@ -187,21 +187,21 @@ public abstract class SubsystemTest exte
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
// Bundles
mavenBundle("org.osgi", "org.osgi.enterprise").version("5.0.0"),
- mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.region").version("3.8.0-SNAPSHOT"),
+ mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.region").version("1.1.0.v20120522-1841"),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
- mavenBundle("org.apache.aries", "org.apache.aries.util").version("1.0.1-SNAPSHOT"),
+ mavenBundle("org.apache.aries", "org.apache.aries.util").version("1.0.0"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
mavenBundle("org.apache.felix", "org.apache.felix.resolver"),
- mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.coordinator").version("3.8.0-SNAPSHOT"),
- mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.event").version("3.8.0-SNAPSHOT"),
+ 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.apache.aries.subsystem", "org.apache.aries.subsystem.api"),
mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.core"),
mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.itest.interfaces"),
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
- equinox().version("3.8.0-SNAPSHOT"));
+ equinox().version("3.8.0.V20120529-1548"));
options = updateOptions(options);
return options;
}
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java?rev=1379067&r1=1379066&r2=1379067&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java Thu Aug 30 19:00:28 2012
@@ -53,6 +53,7 @@ import org.w3c.dom.Document;
public class RepositoryGenerator {
private static final Logger LOGGER = LoggerFactory
.getLogger(RepositoryGenerator.class);
+ private static final String REPOSITORY_FILE = "repository-subsystems.xml";
final private BundleContext context;
private RepositoryAdmin repositoryAdmin;
@@ -83,7 +84,7 @@ public class RepositoryGenerator {
}
// if repository.xml already exists, no need to generate it
- if (new File(obrPath + "repository.xml").exists()) {
+ if (new File(obrPath + REPOSITORY_FILE).exists()) {
registerOBR();
generated = true;
return;
@@ -110,7 +111,7 @@ public class RepositoryGenerator {
doc = RepositoryDescriptorGenerator.generateRepositoryDescriptor(
"Subsystem Repository description", infos);
FileOutputStream fout = new FileOutputStream(obrPath
- + "repository.xml");
+ + REPOSITORY_FILE);
TransformerFactory.newInstance().newTransformer().transform(
new DOMSource(doc), new StreamResult(fout));
@@ -142,7 +143,7 @@ public class RepositoryGenerator {
try {
this.repositoryAdmin.addRepository(new File(obrPath
- + "repository.xml").toURI().toURL());
+ + REPOSITORY_FILE).toURI().toURL());
} catch (Exception e) {
LOGGER.warn("Exception occurred when register obr", e);
e.printStackTrace();
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=1379067&r1=1379066&r2=1379067&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 Thu Aug 30 19:00:28 2012
@@ -41,6 +41,7 @@ public class SsActivator extends Abstrac
new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110221" ),
new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20110621" ),
new EquinoxPlatformBuilder( bundleContext, "3.8.0-SNAPSHOT" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20120529-1548"),
new EquinoxPlatformBuilderSnapshot( bundleContext )
};
}
Added: aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml?rev=1379067&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml (added)
+++ aries/trunk/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml Thu Aug 30 19:00:28 2012
@@ -0,0 +1,8 @@
+<platform>
+
+ <name>Equinox 3.8.0</name>
+ <system>mvn:org.eclipse/org.eclipse.osgi/3.8.0.v20120529-1548</system>
+
+ <profile name="minimal" default="true"/>
+
+</platform>
\ No newline at end of file
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=1379067&r1=1379066&r2=1379067&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 Thu Aug 30 19:00:28 2012
@@ -67,6 +67,7 @@ platform.equinox.3.7.0.V20110110=org.ops
platform.equinox.3.7.0.V20110221=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
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
# 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