You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/11/13 15:56:08 UTC
svn commit: r594556 - in /incubator/servicemix/branches/servicemix-4.0/jbi:
itests/pom.xml
itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
offline/pom.xml
Author: gnodet
Date: Tue Nov 13 06:56:06 2007
New Revision: 594556
URL: http://svn.apache.org/viewvc?rev=594556&view=rev
Log:
Fix JBI integration tests
Modified:
incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml?rev=594556&r1=594555&r2=594556&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml Tue Nov 13 06:56:06 2007
@@ -239,6 +239,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
@@ -292,7 +297,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-shared</artifactId>
+ <artifactId>servicemix-shared-compat</artifactId>
<classifier>installer</classifier>
<type>zip</type>
<version>3.2.1-SNAPSHOT</version>
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=594556&r1=594555&r2=594556&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Tue Nov 13 06:56:06 2007
@@ -17,6 +17,7 @@
package org.apache.servicemix.jbi;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
@@ -102,8 +103,9 @@
protected String getBundleVersion(String groupId, String artifactId) {
if (dependencies == null) {
try {
+ File f = new File(System.getProperty("basedir"), "target/classes/META-INF/maven/dependencies.properties");
Properties prop = new Properties();
- prop.load(getClass().getResourceAsStream("/META-INF/maven/dependencies.properties"));
+ prop.load(new FileInputStream(f));
dependencies = prop;
} catch (IOException e) {
throw new IllegalStateException("Unable to load dependencies informations", e);
@@ -111,7 +113,7 @@
}
String version = dependencies.getProperty(groupId + "/" + artifactId + "/version");
if (version == null) {
- throw new IllegalStateException("Unable to find dependency information for: " + groupId + " / " + artifactId);
+ throw new IllegalStateException("Unable to find dependency information for: " + groupId + "/" + artifactId + "/version");
}
return version;
}
@@ -130,15 +132,14 @@
public void testJbiComponent() throws Exception {
// Test currently fails
- installArtifact("org.apache.servicemix", "servicemix-shared-compat", "3.2.1-SNAPSHOT", "installer", "zip");
- //installArtifact("org.apache.servicemix", "servicemix-shared-compat", "3.2.1-SNAPSHOT", "installer", "zip");
- installArtifact("org.apache.servicemix", "servicemix-eip", "3.2.1-SNAPSHOT", "installer", "zip");
+ installArtifact("org.apache.servicemix", "servicemix-shared-compat", "installer", "zip");
+ installArtifact("org.apache.servicemix", "servicemix-eip", "installer", "zip");
Thread.sleep(1000);
}
- protected void installArtifact(String groupId, String artifactId, String version, String classifier, String type) throws Exception {
- version = getBundleVersion(groupId, artifactId);
+ protected void installArtifact(String groupId, String artifactId, String classifier, String type) throws Exception {
+ String version = getBundleVersion(groupId, artifactId);
File in = localMavenBundle(groupId, artifactId, version, classifier, type);
File out = File.createTempFile("smx", ".jar");
new Main().run(in.toString(), out.toString());
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml?rev=594556&r1=594555&r2=594556&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml Tue Nov 13 06:56:06 2007
@@ -91,7 +91,6 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*</Export-Package>
<Import-Package>org.springframework*;resolution:=optional,*</Import-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
</configuration>
</plugin>