Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java1
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java1
-rw-r--r--org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jubula.feature/feature.xml14
-rw-r--r--org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product1
-rw-r--r--org.eclipse.jubula.product.autagent.stop/org.eclipse.jubula.product.autagent.stop.product2
-rw-r--r--org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly.target1
-rw-r--r--org.eclipse.jubula.project.configuration/target/definitions/indigo.target2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java4
-rw-r--r--org.eclipse.jubula.rc.rcp/.classpath1
-rw-r--r--org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jubula.rc.rcp/build.properties1
-rw-r--r--org.eclipse.jubula.rc.rcp/genLib.xml6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java2
14 files changed, 36 insertions, 2 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
index 3c653e3f1..734bd4981 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
@@ -141,6 +141,7 @@ public class StartHtmlAutServerCommand extends AbstractStartToolkitAut {
CommandConstants.TOOLS_BUNDLE_ID,
CommandConstants.COMMUNICATION_BUNDLE_ID,
CommandConstants.RC_COMMON_BUNDLE_ID,
+ CommandConstants.SLF4J_JCL_BUNDLE_ID,
CommandConstants.SLF4J_API_BUNDLE_ID,
CommandConstants.LOGBACK_CLASSIC_BUNDLE_ID,
CommandConstants.LOGBACK_CORE_BUNDLE_ID,
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
index 062bd149a..4175e08ee 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
@@ -177,6 +177,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
CommandConstants.TOOLS_BUNDLE_ID,
CommandConstants.COMMUNICATION_BUNDLE_ID,
CommandConstants.RC_COMMON_BUNDLE_ID,
+ CommandConstants.SLF4J_JCL_BUNDLE_ID,
CommandConstants.SLF4J_API_BUNDLE_ID,
CommandConstants.COMMONS_LANG_BUNDLE_ID,
CommandConstants.APACHE_ORO_BUNDLE_ID,
diff --git a/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF b/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
index 19b1aa91a..ec378bedd 100644
--- a/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
+ org.slf4j.jcl;bundle-version="[1.5.11,2.0.0)",
org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
ch.qos.logback.classic;bundle-version="[0.9.19,1.0.0)",
ch.qos.logback.core;bundle-version="[0.9.19,1.0.0)",
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 8535e16e3..15f8b97d2 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -229,6 +229,13 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="1.1.1"
+ unpack="false"/>
+
+ <plugin
id="ch.qos.logback.classic"
download-size="0"
install-size="0"
@@ -258,6 +265,13 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
+ id="org.slf4j.jcl"
+ download-size="0"
+ install-size="0"
+ version="1.5.11"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jubula.app.cmd"
download-size="0"
install-size="0"
diff --git a/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product b/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
index 4be5c7b76..3c13308ee 100644
--- a/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
+++ b/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
@@ -42,6 +42,7 @@
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.collections"/>
<plugin id="org.apache.commons.lang"/>
+ <plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.oro"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.jobs"/>
diff --git a/org.eclipse.jubula.product.autagent.stop/org.eclipse.jubula.product.autagent.stop.product b/org.eclipse.jubula.product.autagent.stop/org.eclipse.jubula.product.autagent.stop.product
index af465964e..1b8cf7ccc 100644
--- a/org.eclipse.jubula.product.autagent.stop/org.eclipse.jubula.product.autagent.stop.product
+++ b/org.eclipse.jubula.product.autagent.stop/org.eclipse.jubula.product.autagent.stop.product
@@ -38,6 +38,7 @@
<plugin id="javax.servlet"/>
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.lang"/>
+ <plugin id="org.apache.commons.logging"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
@@ -53,6 +54,7 @@
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.slf4j.api"/>
+ <plugin id="org.slf4j.jcl"/>
</plugins>
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly.target b/org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly.target
index 257248be0..c37767bed 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly.target
@@ -14,6 +14,7 @@
<unit id="ch.qos.logback.core" version="0.9.19.v20100419-1216"/>
<unit id="ch.qos.logback.slf4j" version="0.9.19.v20100519-1910"/>
<unit id="org.slf4j.api" version="1.5.11.v20100519-1910"/>
+<unit id="org.slf4j.jcl" version="1.5.11.v20100419-1106"/>
<repository id="eclipse-orbit-R20120119162704" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" type="InstallableUnit">
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/indigo.target b/org.eclipse.jubula.project.configuration/target/definitions/indigo.target
index 536099844..5efea352f 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/indigo.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/indigo.target
@@ -5,6 +5,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.cli" version="1.2.0.v201105210650"/>
+<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
<unit id="org.apache.commons.beanutils" version="1.7.0.v200902170505"/>
<unit id="org.apache.commons.codec" version="1.2.0.v20100518-1135"/>
<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
@@ -15,6 +16,7 @@
<unit id="ch.qos.logback.core" version="0.9.19.v20100419-1216"/>
<unit id="ch.qos.logback.slf4j" version="0.9.19.v20100519-1910"/>
<unit id="org.slf4j.api" version="1.5.11.v20100519-1910"/>
+<unit id="org.slf4j.jcl" version="1.5.11.v20100419-1106"/>
<repository id="eclipse-orbit-R20120119162704" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
index bf0ca8d51..78fd52021 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
@@ -14,10 +14,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Wrapper class for org.slf4j.Logger
+ * Wrapper class for org.apache.commons.logging
* This class is used in the implementation class context.
* This class will NOT be loaded by the ImplClassClassLoader but by its parent!
- * The methods in this class delegate to the org.slf4j.Logger.
+ * The methods in this class delegate to the org.apache.commons.logging.Log.
* This is neccessary because in the ImplClassClassLoader context u can only
* use plain java code!
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.rc.rcp/.classpath b/org.eclipse.jubula.rc.rcp/.classpath
index 33519872d..ba35c19fa 100644
--- a/org.eclipse.jubula.rc.rcp/.classpath
+++ b/org.eclipse.jubula.rc.rcp/.classpath
@@ -17,6 +17,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
<classpathentry kind="lib" path="lib/org.eclipse.jubula.tools.jar"/>
<classpathentry kind="lib" path="lib/org.slf4j.api.jar"/>
+ <classpathentry kind="lib" path="lib/org.slf4j.jcl.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF
index 340a3bc4d..b0dc034b3 100644
--- a/org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Bundle-ClassPath: .,
lib/org.eclipse.jubula.rc.swt.jar,
lib/org.eclipse.jubula.communication.jar,
lib/org.slf4j.api.jar,
+ lib/org.slf4j.jcl.jar,
lib/ch.qos.logback.slf4j.jar,
lib/ch.qos.logback.core.jar,
lib/ch.qos.logback.classic.jar,
diff --git a/org.eclipse.jubula.rc.rcp/build.properties b/org.eclipse.jubula.rc.rcp/build.properties
index f02e1edb6..784306ecd 100644
--- a/org.eclipse.jubula.rc.rcp/build.properties
+++ b/org.eclipse.jubula.rc.rcp/build.properties
@@ -18,6 +18,7 @@ bin.includes = about.html,\
lib/org.eclipse.jubula.rc.swt.jar,\
lib/org.eclipse.jubula.communication.jar,\
lib/org.slf4j.api.jar,\
+ lib/org.slf4j.jcl.jar,\
lib/ch.qos.logback.slf4j.jar,\
lib/ch.qos.logback.core.jar,\
lib/ch.qos.logback.classic.jar,\
diff --git a/org.eclipse.jubula.rc.rcp/genLib.xml b/org.eclipse.jubula.rc.rcp/genLib.xml
index 85ee1da36..3c4f521e3 100644
--- a/org.eclipse.jubula.rc.rcp/genLib.xml
+++ b/org.eclipse.jubula.rc.rcp/genLib.xml
@@ -61,6 +61,12 @@
</fileset>
<mergemapper to="org.slf4j.api.jar"/>
</copy>
+ <copy todir="lib">
+ <fileset dir="${OrbitStorage}">
+ <include name="org.slf4j.jcl*.jar" />
+ </fileset>
+ <mergemapper to="org.slf4j.jcl.jar"/>
+ </copy>
<copy todir="lib">
<fileset dir="../org.eclipse.jubula.rc.common/target">
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
index 658c4f803..5685acc9f 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
@@ -50,6 +50,8 @@ public abstract class CommandConstants {
public static final String RAP_TOOLKIT = "ui.toolkit.aria.RapToolkitPlugin"; //$NON-NLS-1$
/** ID of the SLF4J API bundle */
public static final String SLF4J_API_BUNDLE_ID = "org.slf4j.api"; //$NON-NLS-1$
+ /** ID of the SLF4J JCL bundle */
+ public static final String SLF4J_JCL_BUNDLE_ID = "org.slf4j.jcl"; //$NON-NLS-1$
/** ID of the logback classic bundle */
public static final String LOGBACK_CLASSIC_BUNDLE_ID = "ch.qos.logback.classic"; //$NON-NLS-1$
/** ID of the logback core bundle */

Back to the top