Author: gnodet
Date: Thu Oct 25 08:33:39 2007
New Revision: 588254
URL: http://svn.apache.org/viewvc?rev=588254&view=rev
Log:
Fix integration tests
Added:
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/boot-bundles.properties
Modified:
incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
incubator/servicemix/branches/servicemix-4.0/pom.xml
Modified: incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/pom.xml?rev=588254&r1=588253&r2=588254&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/pom.xml Thu Oct 25
08:33:39 2007
@@ -41,85 +41,57 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>org.apache.servicemix.nmr</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-osgi</artifactId>
- <version>${camel.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jhc</artifactId>
- <version>${camel.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-test</artifactId>
- <version>${spring.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-extender</artifactId>
- <version>${spring.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-annotation</artifactId>
- <version>${spring.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>log4j.osgi</artifactId>
- <version>1.2.13-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>junit.osgi</artifactId>
- <version>3.8.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>aopalliance.osgi</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -143,25 +115,21 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -193,7 +161,25 @@
<scope>test</scope>
</dependency>
-->
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>junit.osgi</artifactId>
+ <version>3.8.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>asm.osgi</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Springframework Maven SNAPSHOT Repository</name>
+ <url>http://static.springframework.org/maven2-snapshots/</url>
+ </repository>
+ </repositories>
<build>
<plugins>
Modified:
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=588254&r1=588253&r2=588254&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
(original)
+++
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
Thu Oct 25 08:33:39 2007
@@ -19,12 +19,14 @@
import org.apache.servicemix.api.NMR;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
-import java.net.URL;
-
public class IntegrationTest extends AbstractConfigurableBundleCreatorTests {
+ private static final String TEST_FRAMEWORK_BUNDLES_CONF_FILE =
"/org/apache/servicemix/boot-bundles.properties";
+
/**
* The manifest to use for the "virtual bundle" created
* out of the test classes and resources in this project
@@ -79,9 +81,13 @@
};
}
-// protected String getSpringBundledVersion() {
-// return "2.5-rc1";
-// }
+ protected Resource getTestingFrameworkBundlesConfiguration() {
+ return new
InputStreamResource(getClass().getResourceAsStream(TEST_FRAMEWORK_BUNDLES_CONF_FILE));
+ }
+
+ protected String getSpringBundledVersion() {
+ return "2.5-rc1";
+ }
/**
Added:
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/boot-bundles.properties
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/boot-bundles.properties?rev=588254&view=auto
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/boot-bundles.properties
(added)
+++
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/boot-bundles.properties
Thu Oct 25 08:33:39 2007
@@ -0,0 +1,77 @@
+#
+# Properties file indicating the boot (or mandatory) bundles that are loaded
+# by the testing framework.
+#
+# Normally, this file should not be edited since it is used by the testing
infrastructure.
+# Users that want to install bundles before starting a test, should use
#bundles() method.
+#
+
+#
+# format: <groupId,artifactId,version>=+/-15
+# - the optional value is used to install/remove bundles if running on JDK >=
1.5
+# - see Spring org.springframework.core.JdkVersion for jdk major version codes.
+
+# elements that have to be ignored should star with
+# ignore
+
+# Note: inner placeholders are not supported.
+
+#
+# common properties
+#
+
+# versioning
+ignore.aopalliance.version=1.0-SNAPSHOT
+ignore.junit.version=3.8.2-SNAPSHOT
+ignore.asm.version=2.2.3-SNAPSHOT
+
+ignore.spring.version=2.5-rc1
+ignore.spring.osgi.version=1.0-m3
+
+# groupIds
+ignore.spring.groupId=org.springframework
+ignore.spring.osgi.groupId=org.springframework.osgi
+
+#
+# actual libraries
+#
+# listed in dependency order to ease deployment
+
+
+# dependencies
+
+# junit
+${ignore.spring.osgi.groupId},junit.osgi,${ignore.junit.version}=
+#org.apache.servicemix.bundles,org.apache.servicemix.bundles.junit,4.4-4.0-SNAPSHOT=
+# log4j
+#${ignore.spring.osgi.groupId},log4j.osgi,${ignore.log4j.version}=
+# slf4j (commons-logging API)
+#${ignore.slf4j.groupId},slf4j-api,${ignore.slf4j.version}=
+#${ignore.slf4j.groupId},jcl104-over-slf4j,${ignore.slf4j.version}=
+#${ignore.slf4j.groupId},slf4j-log4j12,${ignore.slf4j.version}=
+# aop alliance
+#${ignore.spring.osgi.groupId},aopalliance.osgi,${ignore.aopalliance.version}=
+org.apache.servicemix.bundles,org.apache.servicemix.bundles.aopalliance,1.0-4.0-SNAPSHOT
+# asm
+${ignore.spring.osgi.groupId},asm.osgi,${ignore.asm.version}=
+
+# pax-logging
+org.apache.geronimo.specs,geronimo-servlet_2.5_spec,1.1.1-SNAPSHOT
+org.apache.felix,org.osgi.compendium,0.9.0-SNAPSHOT
+org.ops4j.pax.logging,pax-logging-api,0.9.7-SNAPSHOT
+org.ops4j.pax.logging,pax-logging-service,0.9.7-SNAPSHOT
+
+# spring libs
+${ignore.spring.groupId},spring-beans,${ignore.spring.version}=
+${ignore.spring.groupId},spring-core,${ignore.spring.version}=
+${ignore.spring.groupId},spring-context,${ignore.spring.version}=
+${ignore.spring.groupId},spring-aop,${ignore.spring.version}=
+${ignore.spring.groupId},spring-test,${ignore.spring.version}=
+
+
+# spring osgi libs
+${ignore.spring.osgi.groupId},spring-osgi-io,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},spring-osgi-core,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},spring-osgi-extender,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},spring-osgi-test,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},spring-osgi-annotation,${ignore.spring.osgi.version}=
\ No newline at end of file
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml?rev=588254&r1=588253&r2=588254&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml Thu Oct 25
08:33:39 2007
@@ -37,35 +37,29 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>org.apache.servicemix.core</artifactId>
- <version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>3.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=588254&r1=588253&r2=588254&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/pom.xml Thu Oct 25 08:33:39
2007
@@ -86,18 +86,6 @@
<name>OPS4J repo</name>
<url>http://repository.ops4j.org/maven2</url>
</repository>
- <!-- Spring external dependencies
- <repository>
- <id>spring-ext</id>
- <name>Spring External Dependencies Repository</name>
-
<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
- </repository>-->
- <!-- Spring Snapshots
- <repository>
- <id>spring-snapshots</id>
- <name>Springframework Maven SNAPSHOT Repository</name>
- <url>http://static.springframework.org/maven2-snapshots/</url>
- </repository>-->
<!-- Apache snapshot -->
<repository>
<id>apache-snapshots</id>
@@ -120,6 +108,36 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.nmr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-osgi</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jhc</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security</artifactId>
<version>${acegi.version}</version>
@@ -132,6 +150,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -140,6 +162,26 @@
<version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>2.0.1</version>
@@ -150,6 +192,22 @@
<version>2.0.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>3.1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-eip</artifactId>
+ <version>3.1.2</version>
+ </dependency>
+ <dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
<version>2.1</version>
@@ -164,6 +222,29 @@
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-test</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
@@ -176,6 +257,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
@@ -184,6 +270,16 @@
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
@@ -203,6 +299,11 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
</dependency>
</dependencies>
</dependencyManagement>
