Author: rgoers
Date: Fri Nov  2 15:52:32 2012
New Revision: 1405016

URL: http://svn.apache.org/viewvc?rev=1405016&view=rev
Log:
Remove combined sub-project. Rename slf4j-impl to log4j-slf4j-impl

Removed:
    logging/log4j/log4j2/trunk/combined/
Modified:
    logging/log4j/log4j2/trunk/dist/pom.xml
    logging/log4j/log4j2/trunk/flume-ng/pom.xml
    logging/log4j/log4j2/trunk/pom.xml
    logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm

Modified: logging/log4j/log4j2/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/dist/pom.xml?rev=1405016&r1=1405015&r2=1405016&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/pom.xml (original)
+++ logging/log4j/log4j2/trunk/dist/pom.xml Fri Nov  2 15:52:32 2012
@@ -76,11 +76,6 @@ limitations under the License.
       <classifier>tests</classifier>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-combined</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
       <artifactId>log4j-jcl</artifactId>
       <version>${project.version}</version>
@@ -133,18 +128,18 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <version>${project.version}</version>
       <classifier>javadoc</classifier>
     </dependency>

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1405016&r1=1405015&r2=1405016&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Fri Nov  2 15:52:32 2012
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1405016&r1=1405015&r2=1405016&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Fri Nov  2 15:52:32 2012
@@ -158,7 +158,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j.adapters</groupId>
-        <artifactId>slf4j-impl</artifactId>
+        <artifactId>log4j-slf4j-impl</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -464,7 +464,6 @@
   <modules>
     <module>api</module>
     <module>core</module>
-    <module>combined</module>
     <module>log4j12-api</module>
     <module>slf4j-impl</module>
     <module>jcl-bridge</module>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1405016&r1=1405015&r2=1405016&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Fri Nov  2 15:52:32 2012
@@ -24,7 +24,7 @@
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.apache.logging.log4j.adapters</groupId>
-  <artifactId>slf4j-impl</artifactId>
+  <artifactId>log4j-slf4j-impl</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j SLF4J Binding</name>
   <description>Binding between SLF4J API and Log4J2 Core</description>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm?rev=1405016&r1=1405015&r2=1405016&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm Fri Nov  2 15:52:32 2012
@@ -57,19 +57,6 @@
       </dependency>
     </dependecies>
             ]]></source>
-          <p>
-            As an alternative, users who always want to use the Log4j 2 implementation of the API may simply use
-            the combined jar.
-          </p>
-          <source><![CDATA[
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-combined</artifactId>
-        <version>${Log4jReleaseVersion}</version>
-      </dependency>
-    </dependecies>
-            ]]></source>
       </subsection>
       <subsection name="Optional Components">
         <p>
@@ -110,7 +97,7 @@
     <dependencies>
       <dependency>
         <groupId>org.apache.logging.log4j.adapters</groupId>
-        <artifactId>slf4j-impl</artifactId>
+        <artifactId>log4j-slf4j-impl</artifactId>
         <version>${Log4jReleaseVersion}</version>
       </dependency>
     </dependecies>