You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2012/06/02 13:41:11 UTC
svn commit: r1345492 [18/18] - in /logging/log4j/branches/log4j12modules: ./
contribs/ contribs/CekiGulcu/ contribs/EirikLygre/ contribs/JamesHouse/
contribs/Jamie Tsao/ contribs/JimMoore/ contribs/KevinSteppe/
contribs/KitchingSimon/ contribs/LeosLite...
Added: logging/log4j/branches/log4j12modules/modules/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12modules/modules/pom.xml?rev=1345492&view=auto
==============================================================================
--- logging/log4j/branches/log4j12modules/modules/pom.xml (added)
+++ logging/log4j/branches/log4j12modules/modules/pom.xml Sat Jun 2 11:40:31 2012
@@ -0,0 +1,40 @@
+<!--
+ 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.log4j</groupId>
+ <artifactId>log4j-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>log4j-modules</artifactId>
+ <name>Apache Log4j-Modules POM</name>
+ <description>Apache Log4j Modules Container</description>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>chainsaw</module>
+ <module>contribs</module>
+ <module>lf5</module>
+ <module>net</module>
+ <!-- build not implemented <module>nt</module> -->
+ <module>performance</module>
+ </modules>
+
+</project>
\ No newline at end of file
Propchange: logging/log4j/branches/log4j12modules/modules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/branches/log4j12modules/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12modules/pom.xml?rev=1345492&r1=1345491&r2=1345492&view=diff
==============================================================================
--- logging/log4j/branches/log4j12modules/pom.xml (original)
+++ logging/log4j/branches/log4j12modules/pom.xml Sat Jun 2 11:40:31 2012
@@ -15,27 +15,20 @@
limitations under the License.
-->
-<!--
-Usage notes:
-
-To build NTEventLogAppender.dll using MinGW, place mingw\bin on path for Windows or install mingw
-package on other platforms. Build will execute gcc and windres on Windows and
-i586-mingw32msvc-gcc and i586-mingw32msvc-windres on other platforms.
-
-To build NTEventLogAppender.dll using Microsoft tools, run the appropriate vcvars for the
-target platform and specify -Dntdll_target=msbuild on the mvn command line.
-
--->
-<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">
+<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>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Log4j</name>
- <version>1.2.18-SNAPSHOT</version>
- <description>Apache Log4j 1.2</description>
- <url>http://logging.apache.org/log4j/1.2/</url>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>log4j-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Log4j-Parent POM</name>
+ <version>1.4.0-SNAPSHOT</version>
+ <description>Apache Log4j parent module container.</description>
+ <url>http://logging.apache.org/log4j/</url>
+ <modules>
+ <module>core</module>
+ <module>modules</module>
+ <!--Build not implemented <module>examples</module>-->
+ </modules>
<issueManagement>
<system>Bugzilla</system>
<url>https://issues.apache.org/bugzilla/describecomponents.cgi?product=Log4j</url>
@@ -98,52 +91,7 @@ target platform and specify -Dntdll_targ
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<configuration>
- <workingDirectory>tests</workingDirectory>
- <reportFormat>plain</reportFormat>
<forkMode>pertest</forkMode>
- <skip>false</skip>
- <includes>
- <include>org/apache/log4j/LevelTest.java</include>
- <include>org/apache/log4j/PriorityTest.java</include>
- <include>org/apache/log4j/CategoryTest.java</include>
- <include>org/apache/log4j/FileAppenderTest.java</include>
- <include>org/apache/log4j/LogManagerTest.java</include>
- <include>org/apache/log4j/helpers.LogLogTest.java</include>
- <include>org/apache/log4j/LayoutTest.java</include>
- <include>org/apache/log4j/helpers.DateLayoutTest.java</include>
- <include>org/apache/log4j/TTCCLayoutTest.java</include>
- <include>org/apache/log4j/xml.XMLLayoutTest.java</include>
- <include>org/apache/log4j/HTMLLayoutTest.java</include>
- <include>org/apache/log4j/PatternLayoutTest.java</include>
- <include>org/apache/log4j/spi.LoggingEventTest.java</include>
- <include>org/apache/log4j/spi.ThrowableInformationTest.java</include>
- <include>org/apache/log4j/spi.LocationInfoTest.java</include>
- <include>org/apache/log4j/PropertyConfiguratorTest.java</include>
- <include>org/apache/log4j/MinimumTestCase.java</include>
- <include>org/apache/log4j/LoggerTestCase.java</include>
- <include>org/apache/log4j/PatternLayoutTestCase.java</include>
- <include>org/apache/log4j/HierarchyThresholdTestCase.java</include>
- <include>org/apache/log4j/xml/DOMTestCase.java</include>
- <include>org/apache/log4j/xml/CustomLevelTestCase.java</include>
- <include>org/apache/log4j/customLogger/XLoggerTestCase.java</include>
- <!-- DefaultInit -->
- <!-- SocketServer -->
- <include>org/apache/log4j/xml/XMLLayoutTestCase.java</include>
- <include>org/apache/log4j/xml/AsyncAppenderTestCase.java</include>
- <include>org/apache/log4j/varia/LevelMatchFilterTestCase.java</include>
- <!-- ErrorHandlerTestCase is not run in Ant build either <include>org/apache/log4j/varia/ErrorHandlerTestCase.java</include> -->
- <!-- include>org/apache/log4j/helpers/OptionConverterTestCase.java</include -->
- <include>org/apache/log4j/helpers/BoundedFIFOTestCase.java</include>
- <include>org/apache/log4j/helpers/CyclicBufferTestCase.java</include>
- <include>org/apache/log4j/helpers/PatternParserTestCase.java</include>
- <include>org/apache/log4j/or/ORTestCase.java</include>
- <include>org/apache/log4j/DRFATestCase.java</include>
- <include>org/apache/log4j/RFATestCase.java</include>
- <include>org/apache/log4j/varia/ERFATestCase.java</include>
- <include>org/apache/log4j/net/SyslogAppenderTest</include>
- <include>org/apache/log4j/nt/NTEventLogAppenderTest</include>
- <include>org/apache/log4j/net/SocketAppenderTest</include>
- </includes>
</configuration>
</plugin>
<plugin>
@@ -156,204 +104,6 @@ target platform and specify -Dntdll_targ
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>org/apache/log4j/</name>
- <manifestEntries>
- <DynamicImport-Package>*</DynamicImport-Package>
- <Implementation-Title>log4j</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>"Apache Software Foundation"</Implementation-Vendor>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <!-- generate NTEventLogAppender.dll -->
- <execution>
- <phase>process-classes</phase>
- <id>ntdll</id>
- <configuration>
- <tasks>
- <ant antfile="src/ntdll/build.xml" target="${ntdll_target}">
- <property name="target.dir" location="target" />
- <property name="classes.dir" location="target/classes" />
- <property name="src.dir" location="src/ntdll" />
- <property name="jni.include.dir" location="${java.home}/../include" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <!-- create tests/output prior to test run -->
- <!--
-
- TODO: several tests are run from tests/build.xml,
- for example longUnit
-
- Refactor these tests to run with Surefire
-
-
- <execution>
- <phase>test-compile</phase>
- <id>mkdir_tests_output</id>
- <configuration>
- <tasks>
- <mkdir dir="tests/output" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <phase>clean</phase>
- <id>rmdir_tests_output</id>
- <configuration>
- <tasks>
- <delete dir="tests/output" />
- <delete dir="tests/classes" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <phase>test</phase>
- <id>runAll</id>
- <configuration>
- <tasks>
- <ant dir="tests" target="runAll">
- <property name="m2_repo" location="${m2_repo}" />
- <property name="log4j.jar" location="target/classes" />
- <property name="project.lib.home" location="target" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- -->
- <!-- release builds will put SVN tags into the SCM page, this changes it back to trunk -->
- <execution>
- <phase>site</phase>
- <id>untag-site</id>
- <configuration>
- <tasks>
- <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
- <replaceregexp file="target/site/source-repository.html" match="/tags/[^ "'<]*"
- replace="/trunk" flags="g" />
- <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" flags="g">
- <fileset dir="target/site/apidocs" includes="**/*.html" />
- </replaceregexp>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <!--
-
- TODO: checks out a site from svn. Is that necessary?
-
- <execution>
- <phase>post-site</phase>
- <id>post-site</id>
- <configuration>
- <tasks>
- <ant target="post-site" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- -->
-
-
- <!--
-
- TODO: this is doable from maven
-
- <execution>
- <phase>site-deploy</phase>
- <id>site-deploy</id>
- <configuration>
- <tasks>
- <ant target="site-deploy" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- -->
-
- <execution>
- <id>javadoc.resources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/apidocs/META-INF">
- <fileset dir="${basedir}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b2</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${tools.jar}</systemPath>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<configuration>
@@ -430,11 +180,9 @@ target platform and specify -Dntdll_targ
<artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-3</version>
<configuration>
- <excludes>
- <exclude>tests/witness/**</exclude>
- <exclude>tests/output/**</exclude>
- <exclude>tests/classes/**</exclude>
- </excludes>
+ <excludes>
+ <exclude>src/tests/witness/**</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
@@ -471,99 +219,9 @@ target platform and specify -Dntdll_targ
</executions>
</plugin>
</plugins>
- <testSourceDirectory>tests/src/java</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>tests/resources</directory>
- </testResource>
- </testResources>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>scm</report>
- <report>dependencies</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
- <report>license</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- <profiles>
- <profile>
- <id>mac</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
- <m2_repo>${user.home}/.m2/repository</m2_repo>
- <ntdll_target>build</ntdll_target>
- </properties>
- </profile>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
- <m2_repo>${user.home}/.m2/repository</m2_repo>
- <ntdll_target>build</ntdll_target>
- </properties>
- </profile>
- </profiles>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0-2</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- <!-- the following dependency is not needed on JDK 1.5 and higher <dependency> <groupId>com.sun.jmx</groupId> <artifactId>jmxri</artifactId>
- <version>1.2.1</version> <optional>true</optional> </dependency> -->
- <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>