You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/04/03 14:48:24 UTC
svn commit: r761653 - in /cxf/dosgi/trunk: parent/pom.xml
systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
systests/multi_bundle_distro/pom.xml systests/pom.xml
systests/single_bundle_distro/pom.xml
Author: davidb
Date: Fri Apr 3 12:48:23 2009
New Revision: 761653
URL: http://svn.apache.org/viewvc?rev=761653&view=rev
Log:
Added some missing dependencies used at runtime by the Spring-DM testing framework.
Modified:
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
cxf/dosgi/trunk/systests/pom.xml
cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=761653&r1=761652&r2=761653&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Fri Apr 3 12:48:23 2009
@@ -32,6 +32,7 @@
<asm.bundle.version>2.2.3_1</asm.bundle.version>
<woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
<jaxbimpl.bundle.version>2.1.6_1</jaxbimpl.bundle.version>
+ <slf4j.version>1.5.0</slf4j.version>
<felix.plugin.version>1.4.0</felix.plugin.version>
</properties>
Modified: cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java?rev=761653&r1=761652&r2=761653&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java (original)
+++ cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java Fri Apr 3 12:48:23 2009
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.jar.Manifest;
@@ -122,11 +123,23 @@
@Override
protected String[] getTestFrameworkBundlesNames() {
- List<String> names = new ArrayList<String>(Arrays.asList(super.getTestFrameworkBundlesNames()));
+ List<String> names = new ArrayList<String>(Arrays.asList(super.getTestFrameworkBundlesNames()));
+ fixLog4J(names);
names.add(getBundle("org.apache.felix", "org.osgi.compendium"));
return names.toArray(new String [names.size()]);
}
+ private void fixLog4J(List<String> names) {
+ for (Iterator<String> it = names.iterator(); it.hasNext(); ) {
+ if (it.next().equals("org.springframework.osgi,log4j.osgi,1.2.15-SNAPSHOT")) {
+ it.remove();
+ break;
+ }
+ }
+ // replace it with a better version
+ names.add("org.apache.log4j,com.springsource.org.apache.log4j,1.2.15");
+ }
+
@Override
protected Resource[] getTestBundles() {
// Return the bundles for the current distribution, filtering out the
Modified: cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml?rev=761653&r1=761652&r2=761653&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml Fri Apr 3 12:48:23 2009
@@ -119,6 +119,30 @@
<version>${spring.osgi.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.log4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>1.2.15</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/dosgi/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/pom.xml?rev=761653&r1=761652&r2=761653&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/pom.xml (original)
+++ cxf/dosgi/trunk/systests/pom.xml Fri Apr 3 12:48:23 2009
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
+ <version>${felix.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml?rev=761653&r1=761652&r2=761653&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml Fri Apr 3 12:48:23 2009
@@ -108,6 +108,29 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.log4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>1.2.15</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>