Author: rgoers
Date: Mon Apr 30 05:04:44 2012
New Revision: 1332056
URL: http://svn.apache.org/viewvc?rev=1332056&view=rev
Log:
rename directories to remove log4j2
Added:
logging/log4j/log4j2/trunk/api/
- copied from r1326065, logging/log4j/log4j2/trunk/log4j2-api/
logging/log4j/log4j2/trunk/api/pom.xml
- copied unchanged from r1332055,
logging/log4j/log4j2/trunk/log4j2-api/pom.xml
logging/log4j/log4j2/trunk/core/
- copied from r1326065, logging/log4j/log4j2/trunk/log4j2-core/
logging/log4j/log4j2/trunk/core/pom.xml
- copied unchanged from r1332055,
logging/log4j/log4j2/trunk/log4j2-core/pom.xml
logging/log4j/log4j2/trunk/flume-ng/
- copied from r1326065, logging/log4j/log4j2/trunk/log4j2-flume-ng/
logging/log4j/log4j2/trunk/flume-ng/pom.xml
- copied unchanged from r1332055,
logging/log4j/log4j2/trunk/log4j2-flume-ng/pom.xml
logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
- copied unchanged from r1326476,
logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/flume-og/
- copied from r1326065, logging/log4j/log4j2/trunk/log4j2-flume-og/
logging/log4j/log4j2/trunk/flume-og/pom.xml
- copied unchanged from r1332055,
logging/log4j/log4j2/trunk/log4j2-flume-og/pom.xml
logging/log4j/log4j2/trunk/jcl-bridge/
- copied from r1326065, logging/log4j/log4j2/trunk/log4j2-jcl/
logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
- copied unchanged from r1332055,
logging/log4j/log4j2/trunk/log4j2-jcl/pom.xml
Removed:
logging/log4j/log4j2/trunk/core/LICENSE
logging/log4j/log4j2/trunk/core/NOTICE
logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/LICENSE
logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE
logging/log4j/log4j2/trunk/log4j2-api/
logging/log4j/log4j2/trunk/log4j2-core/
logging/log4j/log4j2/trunk/log4j2-flume-ng/
logging/log4j/log4j2/trunk/log4j2-flume-og/
logging/log4j/log4j2/trunk/log4j2-jcl/
Modified:
logging/log4j/log4j2/trunk/pom.xml
Modified: logging/log4j/log4j2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1332056&r1=1332055&r2=1332056&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Mon Apr 30 05:04:44 2012
@@ -79,10 +79,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL
- </developerConnection>
-
<url>http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/log4j2/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/log4j2/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -92,7 +91,7 @@
<slf4j.version>1.6.4</slf4j.version>
<logback.version>1.0.0</logback.version>
<log4j.parent.dir>${basedir}</log4j.parent.dir>
- <Log4j2ReleaseVersion>1.0-alpha1</Log4j2ReleaseVersion>
+ <Log4jReleaseVersion>2.0-alpha1</Log4jReleaseVersion>
<!-- Configuration properties for the OSGi maven-bundle-plugin -->
<osgi.symbolicName>org.apache.commons.${project.artifactId}</osgi.symbolicName>
<osgi.export>org.apache.logging.log4j.*;version=${project.version};-noimport:=true</osgi.export>
@@ -376,30 +375,30 @@
</site>
</distributionManagement>
<modules>
- <module>log4j2-api</module>
+ <module>api</module>
<module>log4j12-api</module>
- <module>log4j2-core</module>
+ <module>core</module>
<module>slf4j-impl</module>
- <module>log4j2-jcl</module>
+ <module>jcl-bridge</module>
</modules>
<profiles>
<profile>
<id>include-flume</id>
<modules>
- <module>log4j2-flume-og</module>
- <module>log4j2-flume-ng</module>
+ <module>flume-og</module>
+ <module>flume-ng</module>
</modules>
</profile>
<profile>
<id>include-flume-ng</id>
<modules>
- <module>log4j2-flume-ng</module>
+ <module>flume-ng</module>
</modules>
</profile>
<profile>
<id>include-flume-og</id>
<modules>
- <module>log4j2-flume-og</module>
+ <module>flume-og</module>
</modules>
</profile>
<profile>
@@ -417,7 +416,7 @@
<outputDirectory>.</outputDirectory>
<announcementFile>RELEASE-NOTES.txt</announcementFile>
<announcementParameters>
- <releaseVersion>${Log4j2ReleaseVersion}</releaseVersion>
+ <releaseVersion>${Log4jReleaseVersion}</releaseVersion>
</announcementParameters>
</configuration>
<executions>
@@ -451,8 +450,8 @@
</plugins>
</build>
<modules>
- <module>log4j2-flume-og</module>
- <module>log4j2-flume-ng</module>
+ <module>flume-og</module>
+ <module>flume-ng</module>
<module>dist</module>
</modules>
</profile>
