logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1411346 - in /logging/log4j/log4j2/trunk: ./ flume-ng/ flume-ng/src/site/xdoc/ log4j12-api/ src/changes/ src/site/ src/site/xdoc/ src/site/xdoc/manual/
Date Mon, 19 Nov 2012 18:34:27 GMT
Author: rgoers
Date: Mon Nov 19 18:34:25 2012
New Revision: 1411346

URL: http://svn.apache.org/viewvc?rev=1411346&view=rev
Log:
LOG4J2-110 - Renamed log4j12-api to log4j-1.2-api.

Modified:
    logging/log4j/log4j2/trunk/flume-ng/pom.xml
    logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/log4j12-api/pom.xml
    logging/log4j/log4j2/trunk/pom.xml
    logging/log4j/log4j2/trunk/src/changes/announcement.vm
    logging/log4j/log4j2/trunk/src/changes/changes.xml
    logging/log4j/log4j2/trunk/src/site/site.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Mon Nov 19 18:34:25 2012
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>log4j12-api</artifactId>
+      <artifactId>log4j-1.2-api</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml Mon Nov 19 18:34:25 2012
@@ -74,7 +74,7 @@
                   </dependency>
                   <dependency>
                     <groupId>org.apache.logging.log4j.adapters</groupId>
-                    <artifactId>log4j12-api</artifactId>
+                    <artifactId>log4j-1.2-api</artifactId>
                     <version>${log4j2_version}</version>
                   </dependency>
                   <dependency>
@@ -89,7 +89,7 @@
                   </dependency>
                   <dependency>
                     <groupId>org.apache.logging.log4j.adapters</groupId>
-                    <artifactId>slf4j-impl</artifactId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
                     <version>${log4j2_version}</version>
                   </dependency>
                   <dependency>

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Mon Nov 19 18:34:25 2012
@@ -24,7 +24,7 @@
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.apache.logging.log4j.adapters</groupId>
-  <artifactId>log4j12-api</artifactId>
+  <artifactId>log4j-1.2-api</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j 1.x Compatibility API</name>
   <description>The Log4J Compatibility API</description>

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Mon Nov 19 18:34:25 2012
@@ -98,7 +98,7 @@
     <log4jParentDir>${basedir}</log4jParentDir>
     <Log4jReleaseVersion>2.0-beta3</Log4jReleaseVersion>
     <!-- Configuration properties for the OSGi maven-bundle-plugin -->
-    <osgi.symbolicName>org.apache.commons.${project.artifactId}</osgi.symbolicName>
+    <osgi.symbolicName>org.apache.logging.${project.artifactId}</osgi.symbolicName>
     <osgi.export>org.apache.logging.log4j.*;version=${project.version};-noimport:=true</osgi.export>
     <osgi.import>*</osgi.import>
     <osgi.dynamicImport />
@@ -175,7 +175,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j.adapters</groupId>
-        <artifactId>log4j12-api</artifactId>
+        <artifactId>log4j-1.2-api</artifactId>
         <version>${project.version}</version>
       </dependency>
  	    <dependency>

Modified: logging/log4j/log4j2/trunk/src/changes/announcement.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/announcement.vm?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/announcement.vm (original)
+++ logging/log4j/log4j2/trunk/src/changes/announcement.vm Mon Nov 19 18:34:25 2012
@@ -21,7 +21,7 @@
 The ${developmentTeam} is pleased to announce the Log4j ${relVersion} release!
 
 Apache Log4j ${relVersion} requires a minimum of Java 5 to build and run. Basic compatibility
with
-Log4j 1.x is provided through the log4j12-api component, however it does not implement some
of the
+Log4j 1.x is provided through the log4j-1.2-api component, however it does not implement
some of the
 very implementation specific classes and methods. The package names and Maven groupId have
been changed to
 org.apache.logging.log4j to avoid any conflicts with log4j 1.x.
 

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Nov 19 18:34:25 2012
@@ -23,6 +23,9 @@
 
   <body>
     <release version="2.0-beta4" date="TBD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-110" dev="rgoers" type="update">
+        Renamed log4j12-api to log4j-1.2-api.
+      </action>
       <action issue="LOG4J2-120" dev="rgoers" type="fix">
         TCPSocketManager would fail if the initial connection could not be established.
       </action>

Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Mon Nov 19 18:34:25 2012
@@ -121,7 +121,7 @@
     <menu name="Components" inherit="top" img="icon-cog">
       <item name="API" href="log4j-api/index.html"/>
       <item name="Impl" href="log4j-core/index.html"/>
-      <item name="Log4J 1.2 API" href="log4j12-api/index.html"/>
+      <item name="Log4J 1.2 API" href="log4j-1.2-api/index.html"/>
       <item name="Commons Logging Bridge" href="log4j-jcl/index.html"/>
       <item name="SLF4J Binding" href="log4j-slf4j-impl/index.html"/>
       <item name="Apache Flume" href="log4j-flume-ng/index.html"/>

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=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/build.xml.vm Mon Nov 19 18:34:25 2012
@@ -29,7 +29,7 @@
         <p>
           Log4j 2.x is hosted in the Apache Software Foundation's subversion repository.
Details on obtaining the
           most current source code can be found at
-          <a href="./source-repository.html">Log4j Source Repository</a>. The
source from the latest release may be 
+          <a href="./source-repository.html">Log4j Source Repository</a>. The
source from the latest release may be
           obtained by downloading it using the instructions at <a href="./download.html">Log4j
Downloads</a>.
         </p>
         <p>
@@ -69,7 +69,7 @@
 <dependencies>
   <dependency>
     <groupId>org.apache.logging.log4j.adapters</groupId>
-    <artifactId>log4j12-api</artifactId>
+    <artifactId>log4j-1.2-api</artifactId>
     <version>${Log4jReleaseVersion}</version>
   </dependency>
 </dependecies>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml?rev=1411346&r1=1411345&r2=1411346&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Mon Nov 19 18:34:25 2012
@@ -28,7 +28,7 @@
           <subsection name="The Log4j 1.x bridge">
             <p>
               Perhaps the simplest way to convert to using Log4j 2 is to replace the log4j
1.x jar file with
-              Log4j 2's log4j12-api jar. However, to use this successfully applications must
meet the
+              Log4j 2's log4j-1.2-api jar. However, to use this successfully applications
must meet the
               following requirements:
               <ol>
                 <li>They must not access methods and classes internal to the Log4j
1.x implementation such



Mime
View raw message