You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2008/06/23 17:04:38 UTC
svn commit: r670647 - in
/servicemix/sandbox/chirino/smx3-trunk-component-splitout: ./
deployables/serviceengines/servicemix-lwcontainer/
deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/
Author: chirino
Date: Mon Jun 23 08:04:38 2008
New Revision: 670647
URL: http://svn.apache.org/viewvc?rev=670647&view=rev
Log:
fixing up lwconatiner test to use new component versions
Modified:
servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/pom.xml
servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml
Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/pom.xml?rev=670647&r1=670646&r2=670647&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/pom.xml Mon Jun 23 08:04:38 2008
@@ -49,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-quartz</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -66,6 +66,26 @@
<component>org.apache.servicemix.lwcontainer.LwContainerComponent</component>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>log4j-tests.properties</value>
+ </property>
+ <property>
+ <name>servicemix-shared-version</name>
+ <value>${servicemix-shared-version}</value>
+ </property>
+ <property>
+ <name>servicemix-quartz-version</name>
+ <value>${servicemix-quartz-version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java?rev=670647&r1=670646&r2=670647&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java Mon Jun 23 08:04:38 2008
@@ -111,14 +111,14 @@
InstallSharedLibrary isl = new InstallSharedLibrary();
isl.setGroupId("org.apache.servicemix");
isl.setArtifactId("servicemix-shared");
- isl.setVersion(getServiceMixVersion());
+ isl.setVersion(System.getProperty("servicemix-shared-version", "3.2.1"));
isl.afterPropertiesSet();
isl.deploy(container);
InstallComponent ic = new InstallComponent();
ic.setGroupId("org.apache.servicemix");
ic.setArtifactId("servicemix-quartz");
- ic.setVersion(getServiceMixVersion());
+ ic.setVersion(System.getProperty("servicemix-quartz-version", "3.2.1"));
ic.afterPropertiesSet();
ic.deploy(container);
Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml?rev=670647&r1=670646&r2=670647&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml Mon Jun 23 08:04:38 2008
@@ -50,6 +50,8 @@
<properties>
<servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+ <servicemix-quartz-version>4.0-SNAPSHOT</servicemix-quartz-version>
+
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
<xfire-version>1.2.5</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
@@ -82,7 +84,7 @@
<snapshots-repo-id>apache.snapshots</snapshots-repo-id>
<snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
<snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
- <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
+ <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
</properties>
<profiles>
@@ -662,7 +664,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-quartz</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>${servicemix-quartz-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>