Index: osgi/core-osgi-net/pom.xml
===================================================================
--- osgi/core-osgi-net/pom.xml	(revision 1505664)
+++ osgi/core-osgi-net/pom.xml	(working copy)
@@ -38,6 +38,19 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.1_spec</artifactId>
+      <version>1.1</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +67,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -68,7 +80,7 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: osgi/pom.xml
===================================================================
--- osgi/pom.xml	(revision 1505664)
+++ osgi/pom.xml	(working copy)
@@ -46,6 +46,8 @@
     <module>core-osgi-nosql-couch</module>
     <module>core-osgi-nosql-mongo</module>
     <module>core-osgi-reduced</module>
+    <module>core-osgi-web</module>
+    <module>core-osgi-test</module>
   </modules>
 </project>
 
Index: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java
===================================================================
--- osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java	(revision 0)
+++ osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java	(working copy)
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.osgi.tests;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender;
+import org.apache.logging.log4j.core.appender.OutputStreamManager;
+import org.apache.logging.log4j.core.filter.CompositeFilter;
+
+/**
+ *
+ */
+public class InMemoryAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+
+    public InMemoryAppender(final String name, final Layout<T> layout, final CompositeFilter filters,
+                            final boolean ignoreExceptions) {
+        super(name, layout, filters, ignoreExceptions, true, new InMemoryManager(name, layout));
+    }
+
+    @Override
+    public String toString() {
+        return getManager().toString();
+    }
+
+    private static class InMemoryManager extends OutputStreamManager {
+
+        public InMemoryManager(final String name, final Layout layout) {
+            super(new ByteArrayOutputStream(), name, layout);
+        }
+
+        @Override
+        public String toString() {
+            return getOutputStream().toString();
+        }
+    }
+}
Index: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java
===================================================================
--- osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java	(revision 0)
+++ osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java	(working copy)

Property changes on: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/InMemoryAppender.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
Index: core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java	(revision 1505664)
+++ core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java	(working copy)
@@ -36,7 +36,6 @@
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.LifeCycle;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttr;
 import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
@@ -482,7 +481,11 @@
     // for synchronous loggers, includeLocation default is TRUE.
     protected static boolean includeLocation(final String includeLocationConfigValue) {
         if (includeLocationConfigValue == null) {
-            final boolean sync = !AsyncLoggerContextSelector.class.getName()
+        	// Originally this code used AsyncLoggerContextSelector.class.getName() 
+        	// but this introduces a cyclic package dependency and makes it impossible
+        	// to separate the log4j JARs by function. As the class name is API
+        	// (clients are setting it as a System property) there is no risk in hard-coding. 
+            final boolean sync = !"org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
                     .equals(System.getProperty(Constants.LOG4J_CONTEXT_SELECTOR));
             return sync;
         }
Index: core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java	(revision 1505664)
+++ core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java	(working copy)
@@ -229,8 +229,18 @@
                         final String name = dis.readUTF();
                         final boolean printable = dis.readBoolean();
                         final boolean defer = dis.readBoolean();
-                        final Class<?> clazz = Class.forName(className);
-                        types.put(key, new PluginType(clazz, name, printable, defer));
+                        // We sometimes don't have the full set of dependencies available
+                        // to load our plugins, for example the JMS and SMTP Appenders
+                        // need the full o.a.l.l.core.net package, which isn't in the reduced
+                        // log4j bundle, and so needs the core-net extension to be added.
+                        try {
+                            final Class<?> clazz = Class.forName(className);
+                            types.put(key, new PluginType(clazz, name, printable, defer));
+                        } catch (ClassNotFoundException cnfe) {
+                            LOGGER.warn("Unable to preload plugin " + name, cnfe);
+                        } catch (NoClassDefFoundError cnfe) {
+                            LOGGER.warn("Unable to preload plugin " + name, cnfe);
+                        }
                     }
                     map.putIfAbsent(type, types);
                 }
Index: osgi/core-osgi-reduced/pom.xml
===================================================================
--- osgi/core-osgi-reduced/pom.xml	(revision 1505664)
+++ osgi/core-osgi-reduced/pom.xml	(working copy)
@@ -38,6 +38,21 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+        <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>core</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +69,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -67,13 +81,29 @@
               !${project.parent.groupId}.core.appender.db.nosql.*,
               !${project.parent.groupId}.core.async.*,
               !${project.parent.groupId}.core.net.*,
+              !${project.parent.groupId}.core.web.*,
               ${project.parent.groupId}.core.*
             </Export-Package>
             <Private-Package>${osgi.private}</Private-Package>
-            <Import-Package>${osgi.import}</Import-Package>
+            <Import-Package>
+              ${project.parent.groupId}.core.net;resolution:=optional,
+              ${osgi.import}
+            </Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
+            <Include-Resource>
+              @log4j-core-${project.version}.jar!/Log4j-V2.0.xsd,
+              @log4j-core-${project.version}.jar!/Log4j-events.dtd,
+              @log4j-core-${project.version}.jar!/Log4j-events.xsd,
+              @log4j-core-${project.version}.jar!/META-INF/DEPENDENCIES,
+              @log4j-core-${project.version}.jar!/META-INF/LICENSE,
+              @log4j-core-${project.version}.jar!/META-INF/log4j-provider.properties,
+              @log4j-core-${project.version}.jar!/META-INF/NOTICE,
+              @log4j-core-${project.version}.jar!/org/apache/logging/log4j/core/net/Advertiser.class,
+              @log4j-core-${project.version}.jar!/org/apache/logging/log4j/core/net/Facility.class,
+              @log4j-core-${project.version}.jar!/org/apache/logging/log4j/core/net/Priority.class
+            </Include-Resource>
           </instructions>
         </configuration>
         <executions>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1505664)
+++ pom.xml	(working copy)
@@ -157,6 +157,8 @@
     <maven.compile.target>1.6</maven.compile.target>
     <docLabel>Site Documentation</docLabel>
     <projectDir />
+    <pax.exam.version>3.1.0</pax.exam.version>
+    <pax.url.version>1.6.0</pax.url.version>
   </properties>
   <pluginRepositories>
     <pluginRepository>
@@ -382,7 +384,7 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.0</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.mockejb</groupId>
@@ -442,6 +444,37 @@
         <artifactId>lightcouch</artifactId>
         <version>0.0.5</version>
       </dependency>
+    
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-container-forked</artifactId>
+        <version>${pax.exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-junit4</artifactId>
+        <version>${pax.exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-link-mvn</artifactId>
+        <version>${pax.exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-aether</artifactId>
+        <version>${pax.url.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.framework</artifactId>
+        <version>4.2.1</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -612,7 +645,7 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>true</excludeDependencies>
+          <excludeDependencies>false</excludeDependencies>
           <manifestLocation>target/osgi</manifestLocation>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
Index: osgi/core-osgi-test/pom.xml
===================================================================
--- osgi/core-osgi-test/pom.xml	(revision 0)
+++ osgi/core-osgi-test/pom.xml	(working copy)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j</artifactId>
+    <version>2.0-beta9-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.apache.logging.log4j.osgi</groupId>
+  <artifactId>log4j-core-osgi-test</artifactId>
+  <name>Apache Log4J Core OSGi Tests</name>
+  <description>Apache Log4J Implementation Tests for OSGi.</description>
+  <properties>
+    <log4jParentDir>${basedir}/../..</log4jParentDir>
+    <docLabel>Core Documentation</docLabel>
+    <projectDir>/core</projectDir>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j.osgi</groupId>
+      <artifactId>log4j-core-osgi-reduced</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-forked</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+    </dependency>
+  </dependencies>
+  <profiles>
+    <profile>
+      <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
+      <id>yourkit</id>
+
+      <properties>
+        <yourkit.home>/Applications/YourKit_Java_Profiler_8.0.17.app</yourkit.home>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>com.yourkit</groupId>
+          <artifactId>yjp-controller-api-redist</artifactId>
+          <version>8.0.17</version>
+          <scope>system</scope>
+          <systemPath>${yourkit.home}/lib/yjp-controller-api-redist.jar</systemPath>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
+
Index: osgi/core-osgi-test/pom.xml
===================================================================
--- osgi/core-osgi-test/pom.xml	(revision 0)
+++ osgi/core-osgi-test/pom.xml	(working copy)

Property changes on: osgi/core-osgi-test/pom.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
Index: osgi/core-osgi-jpa/pom.xml
===================================================================
--- osgi/core-osgi-jpa/pom.xml	(revision 1505664)
+++ osgi/core-osgi-jpa/pom.xml	(working copy)
@@ -38,6 +38,18 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>javax.persistence</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +66,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -68,7 +79,7 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: osgi/core-osgi-nosql-couch/pom.xml
===================================================================
--- osgi/core-osgi-nosql-couch/pom.xml	(revision 1505664)
+++ osgi/core-osgi-nosql-couch/pom.xml	(working copy)
@@ -38,6 +38,10 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.lightcouch</groupId>
+      <artifactId>lightcouch</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +58,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -68,7 +71,7 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: osgi/core-osgi-async/pom.xml
===================================================================
--- osgi/core-osgi-async/pom.xml	(revision 1505664)
+++ osgi/core-osgi-async/pom.xml	(working copy)
@@ -38,6 +38,10 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.lmax</groupId>
+        <artifactId>disruptor</artifactId>
+      </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +58,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -68,7 +71,7 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: osgi/core-osgi-web/pom.xml
===================================================================
--- osgi/core-osgi-web/pom.xml	(revision 0)
+++ osgi/core-osgi-web/pom.xml	(working copy)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j</artifactId>
+    <version>2.0-beta9-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.apache.logging.log4j.osgi</groupId>
+  <artifactId>log4j-core-osgi-web</artifactId>
+  <packaging>bundle</packaging>
+  <name>Apache Log4J Core OSGi Web</name>
+  <description>Apache Log4J Implementation.</description>
+  <properties>
+    <log4jParentDir>${basedir}/../..</log4jParentDir>
+    <docLabel>Core Documentation</docLabel>
+    <projectDir>/core</projectDir>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <!--
+            dummy entry to stop bundle plugin from picking up jar config and reporting
+            WARNING: Duplicate name in Manifest
+            See http://markmail.org/message/mpkl24wk3jrjhhjg
+          -->
+          <archive>
+            <forced>true</forced>
+          </archive>
+          <instructions>
+            <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
+            <_nouses>true</_nouses>
+            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->
+            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+            <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
+            <Export-Package>
+              ${project.parent.groupId}.core.web
+            </Export-Package>
+            <Private-Package>${osgi.private}</Private-Package>
+              <Import-Package>javax.servlet;version="[2.5,3)",
+                  ${osgi.import}
+              </Import-Package>
+            <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
+            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>cleanVersions</goal>
+            </goals>
+            <configuration>
+              <versions>
+                <project.version.osgi>${project.version}</project.version.osgi>
+              </versions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
+      <id>yourkit</id>
+
+      <properties>
+        <yourkit.home>/Applications/YourKit_Java_Profiler_8.0.17.app</yourkit.home>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>com.yourkit</groupId>
+          <artifactId>yjp-controller-api-redist</artifactId>
+          <version>8.0.17</version>
+          <scope>system</scope>
+          <systemPath>${yourkit.home}/lib/yjp-controller-api-redist.jar</systemPath>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
+
Index: osgi/core-osgi-web/pom.xml
===================================================================
--- osgi/core-osgi-web/pom.xml	(revision 0)
+++ osgi/core-osgi-web/pom.xml	(working copy)

Property changes on: osgi/core-osgi-web/pom.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
Index: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java
===================================================================
--- osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java	(revision 0)
+++ osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java	(working copy)
@@ -0,0 +1,78 @@
+package org.apache.logging.log4j.core.osgi.tests;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.helpers.Constants;
+import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class OSGiSniffTest {
+ 
+    @Configuration
+    public Option[] configCore() {
+ 
+    	/* Install log4j into the OSGi framework */
+        return options(
+        	mavenBundle("org.apache.logging.log4j", "log4j-core").noStart(),
+        	mavenBundle("org.apache.logging.log4j", "log4j-api"),
+            junitBundles()
+            );
+    }
+
+    @Configuration
+    public Option[] configCoreOSGiReduced() {
+    	
+    	/* Install log4j into the OSGi framework */
+    	return options(
+    			mavenBundle("org.apache.logging.log4j.osgi", "log4j-core-osgi-reduced").noStart(),
+    			mavenBundle("org.apache.logging.log4j", "log4j-api"),
+    			junitBundles()
+    			);
+    }
+ 
+    @Test
+    public void testLoggingInOSGi() {
+    	
+    	final Layout<String> layout = PatternLayout.createLayout(null, null, null, null, null);
+    	final InMemoryAppender<String> app = new InMemoryAppender<String>("test", layout, null, false);
+        
+    	System.out.println(LogManager.getContext().getClass().getName());
+    	
+    	Logger logger = (Logger) LogManager.getLogger();
+        
+    	logger.addAppender(app);
+        
+    	app.start();
+    	assertTrue("Appender did not start", app.isStarted());
+        
+    	logger.setLevel(Level.INFO);
+        logger.log(Level.INFO, "Test");
+        final String msg = app.toString();
+        
+        assertNotNull("No message", msg);
+        assertTrue("Incorrect message: " + msg , msg.endsWith("Test" + Constants.LINE_SEP));
+        
+        app.stop();
+        assertFalse("Appender did not stop", app.isStarted());
+        
+        logger.removeAppender(app);
+    }
+   
+}
\ No newline at end of file
Index: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java
===================================================================
--- osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java	(revision 0)
+++ osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java	(working copy)

Property changes on: osgi/core-osgi-test/src/test/java/org/apache/logging/log4j/core/osgi/tests/OSGiSniffTest.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
Index: osgi/core-osgi-nosql-mongo/pom.xml
===================================================================
--- osgi/core-osgi-nosql-mongo/pom.xml	(revision 1505664)
+++ osgi/core-osgi-nosql-mongo/pom.xml	(working copy)
@@ -38,6 +38,10 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -54,7 +58,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>false</excludeDependencies>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
             <_nouses>true</_nouses>
@@ -68,7 +71,7 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: core/pom.xml
===================================================================
--- core/pom.xml	(revision 1505664)
+++ core/pom.xml	(working copy)
@@ -203,7 +203,6 @@
           <archive>
             <forced>true</forced>
           </archive>
-          <excludeDependencies>true</excludeDependencies>
           <manifestLocation>target/osgi</manifestLocation>
           <instructions>
             <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
@@ -213,10 +212,13 @@
             <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
             <Export-Package>${osgi.export}</Export-Package>
             <Private-Package>${osgi.private}</Private-Package>
-            <Import-Package>${osgi.import}</Import-Package>
+            <Import-Package>
+              javax.servlet;version="[2.5,3)";resolution:=optional,
+              ${osgi.import}
+            </Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=&quot;[${project.version.osgi},${project.version.osgi}]&quot;</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
Index: api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
===================================================================
--- api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java	(revision 1505664)
+++ api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java	(working copy)
@@ -97,6 +97,30 @@
         }
         if (cl == null) {
             cl = ProviderUtil.class.getClassLoader();
+        } else {
+        	// If the ThreadContextClassLoader can't see the Class/Resource we need
+        	// then we should fall back to the ClassLoader that loaded Log4J
+        	cl = new ClassLoader(cl) {
+
+        		ClassLoader log4JClassLoader = ProviderUtil.class.getClassLoader();
+				
+        		@Override
+				protected Class<?> findClass(String name)
+						throws ClassNotFoundException {
+					return log4JClassLoader.loadClass(name);
+				}
+
+				@Override
+				protected URL findResource(String name) {
+					return log4JClassLoader.getResource(name);
+				}
+
+				@Override
+				protected Enumeration<URL> findResources(String name)
+						throws IOException {
+					return log4JClassLoader.getResources(name);
+				}
+			};
         }
 
         return cl;