Author: jconlon
Date: Sun Feb 25 04:06:20 2007
New Revision: 758
Modified:
slf4j/trunk/slf4j-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF
Log:
Changed to conform to the refactored spring-osgi testing api. Adapted to test
new slf4j-api bundle.
Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Sun Feb 25 04:06:20 2007
@@ -23,88 +23,95 @@
</description>
<!-- These dependencies are deceptive they are only for the
springframework testing env.
bundles being tested are specified in the -->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-osgi-test-bundle</artifactId>
- <version>${parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>org.springframework.osgi.test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>jcl104-over-slf4j.osgi</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j-full</artifactId>
- <version>1.1.0</version>
- <scope>provided</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>backport-util-concurrent</artifactId>
- <version>3.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
- <build>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-osgi-test-bundle</artifactId>
+ <version>${parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>jcl104-over-slf4j.osgi</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j-full</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</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>backport-util-concurrent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
Sun Feb 25 04:06:20 2007
@@ -42,7 +42,8 @@
public static final String SPRINGFRAMEWORK_OSGI_GROUP_NAME =
"org.springframework.osgi";
-
+ public static final String API_BUNDLE_ARTIFACT_ID = "slf4j-api";
+
public static final String JCL104_ADAPTER_BUNDLE_ARTIFACT_ID =
"jcl104-over-slf4j";
public static final String LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID =
"osgi-over-slf4j";
@@ -60,15 +61,15 @@
public static final String TEST_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+TEST_BUNDLE_ARTIFACT_ID;
- public static final String NOP_BINDING_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+NOP_BINDING_BUNDLE_ARTIFACT_ID;
+ public static final String NOP_BINDING_BUNDLE_SYM_NAME = "slf4j.nop";
- public static final String LOG4J_BINDING_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+LOG4J12_BINDING_BUNDLE_ARTIFACT_ID;
+ public static final String LOG4J_BINDING_BUNDLE_SYM_NAME =
"slf4j.log4j12";
- public static final String SIMPLE_BINDING_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+SIMPLE_BINDING_BUNDLE_ARTIFACT_ID;
+ public static final String SIMPLE_BINDING_BUNDLE_SYM_NAME
="slf4j.simple";
- public static final String JDK_BINDING_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+JDK14_BINDING_BUNDLE_ARTIFACT_ID;
+ public static final String JDK_BINDING_BUNDLE_SYM_NAME = "slf4j.jdk14";
- public static final String JCL_ADAPTER_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+JCL104_ADAPTER_BUNDLE_ARTIFACT_ID;
+ public static final String JCL_ADAPTER_BUNDLE_SYM_NAME =
"jcl104.over.slf4j";
public static final String LOGSERVICE_ADAPTER_BUNDLE_SYM_NAME =
SLF4J_GROUP_ID+'.'+LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID;
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java
Sun Feb 25 04:06:20 2007
@@ -104,8 +104,9 @@
"spring-osgi-core",
"1.0-SNAPSHOT"),
localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
"2.1-SNAPSHOT"),
-
localMavenArtifact(SLF4J_GROUP_ID, JDK14_BINDING_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST),
-
localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID,
+ localMavenArtifact(SLF4J_GROUP_ID,
API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
+ localMavenArtifact(SLF4J_GROUP_ID,
JDK14_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
+ localMavenArtifact(SLF4J_GROUP_ID,
TEST_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST) };
}
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java
Sun Feb 25 04:06:20 2007
@@ -111,6 +111,7 @@
"spring-osgi-core",
"1.0-SNAPSHOT"),
localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
"2.1-SNAPSHOT"),
+ localMavenArtifact(SLF4J_GROUP_ID,
API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
LOG4J12_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
TEST_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST) };
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
Sun Feb 25 04:06:20 2007
@@ -106,6 +106,7 @@
localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
"2.1-SNAPSHOT"),
localMavenArtifact( "org.osgi", "org.osgi.compendium", "4.0" ),
+ localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
SIMPLE_BINDING_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java
Sun Feb 25 04:06:20 2007
@@ -102,8 +102,9 @@
"spring-osgi-core",
"1.0-SNAPSHOT"),
localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
"2.1-SNAPSHOT"),
-
localMavenArtifact(SLF4J_GROUP_ID, NOP_BINDING_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST),
-
localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID,
+ localMavenArtifact(SLF4J_GROUP_ID,
API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
+ localMavenArtifact(SLF4J_GROUP_ID,
NOP_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
+ localMavenArtifact(SLF4J_GROUP_ID,
TEST_BUNDLE_ARTIFACT_ID,
SLF4J_VERSION_UNDER_TEST) };
}
@@ -143,7 +144,7 @@
}
}
- assertTrue(symNames.contains(NOP_BINDING_BUNDLE_SYM_NAME));
+ assertTrue("Could not find "+NOP_BINDING_BUNDLE_SYM_NAME,
symNames.contains(NOP_BINDING_BUNDLE_SYM_NAME));
assertTrue(symNames.contains(TEST_BUNDLE_SYM_NAME));
}
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
Sun Feb 25 04:06:20 2007
@@ -105,6 +105,7 @@
"spring-osgi-core",
"1.0-SNAPSHOT"),
localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
"2.1-SNAPSHOT"),
+ localMavenArtifact(SLF4J_GROUP_ID,
API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
SIMPLE_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
JCL104_ADAPTER_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
localMavenArtifact(SLF4J_GROUP_ID,
TEST_BUNDLE_ARTIFACT_ID,
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF
Sun Feb 25 04:06:20 2007
@@ -7,7 +7,6 @@
org.osgi.framework;specification-version="1.3.0",
org.springframework.core.io;specification-version="2.1.0",
org.springframework.osgi.test,
- org.springframework.osgi.test.runner,
org.slf4j,
org.slf4j.osgi.test.service
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF
Sun Feb 25 04:06:20 2007
@@ -7,7 +7,6 @@
org.osgi.framework;specification-version="1.3.0",
org.springframework.core.io;specification-version="2.1.0",
org.springframework.osgi.test,
- org.springframework.osgi.test.runner,
org.slf4j,
org.slf4j.osgi.test.service
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
Sun Feb 25 04:06:20 2007
@@ -8,7 +8,6 @@
org.osgi.framework;specification-version="1.3.0",
org.springframework.core.io;specification-version="2.1.0",
org.springframework.osgi.test,
- org.springframework.osgi.test.runner,
org.slf4j,
org.osgi.service.log
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF
Sun Feb 25 04:06:20 2007
@@ -7,7 +7,6 @@
org.osgi.framework;specification-version="1.3.0",
org.springframework.core.io;specification-version="2.1.0",
org.springframework.osgi.test,
- org.springframework.osgi.test.runner,
org.slf4j,
org.slf4j.osgi.test.service
Modified:
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF
==============================================================================
---
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF
(original)
+++
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF
Sun Feb 25 04:06:20 2007
@@ -7,7 +7,6 @@
org.osgi.framework;specification-version="1.3.0",
org.springframework.core.io;specification-version="2.1.0",
org.springframework.osgi.test,
- org.springframework.osgi.test.runner,
org.slf4j,
org.slf4j.osgi.test.service
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
