jboynes 2004/02/12 10:17:17
Modified: modules/core maven.xml project.xml
Removed: modules/core/src/java/org/apache/geronimo/core/logging/log4j
CachingLog4jLog.java Log4jService.java
Log4jSocketServer.java NamedNDC.java
NamedNDCConverter.java NamedNDCFilter.java
PatternLayout.java PatternParser.java
URLConfigurator.java XLevel.java
modules/core/src/java/org/apache/geronimo/core/logging/log4j/appender
AbstractAppenderService.java
ConsoleAppenderService.java
DailyRollingFileAppenderService.java
FileAppenderService.java
RollingFileAppenderService.java
modules/core/src/java/org/apache/geronimo/core/serverinfo
ServerConstants.java ServerInfo.java
modules/core/src/test/org/apache/geronimo/core/logging/log4j
Log4jServiceTest.java
modules/core/src/test/org/apache/geronimo/core/serverinfo
ServerInfoTest.java
Log:
Moved to system module
Revision Changes Path
1.27 +2 -72 incubator-geronimo/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- maven.xml 11 Feb 2004 03:14:10 -0000 1.26
+++ maven.xml 12 Feb 2004 18:17:17 -0000 1.27
@@ -5,91 +5,21 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xdoclet="common:xdoclet"
- xmlns:castor="common:castor">
+ >
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
<postGoal name="jar:jar">
- <ant:jar destfile="${basedir}/target/jsr88-geronimo-plugin.jar"
- basedir="${basedir}/target/classes"
-
includes="org/apache/geronimo/enterprise/deploy/server/**/*.class"
-
manifest="${basedir}/src/etc/jsr88-product-provider-manifest.mf"/>
- </postGoal>
-
- <postGoal name="jar:jar">
<ant:jar
destfile="${basedir}/target/geronimo-core-rmiclassloaderspi.jar"
basedir="${basedir}/target/classes"
includes="org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.class"/>
</postGoal>
- <postGoal name="jar:jar">
- <ant:jar destfile="${basedir}/target/geronimo-schemas.jar"
- basedir="${basedir}/src/schema"
- includes="*.xsd"/>
- </postGoal>
-
- <postGoal name="jar:jar">
- <ant:jar
destfile="${basedir}/target/log4j-service-${pom.currentVersion}.jar">
- <fileset dir="${basedir}/target/classes"
includes="org/apache/geronimo/core/logging/log4j/**/*.class"/>
- <fileset dir="${basedir}/src/etc/logging"
includes="META-INF/geronimo-service.xml"/>
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('log4j-service') ==
'true'}">
- <fileset file="${artifact.path}"/>
- </j:if>
- </j:forEach>
- </ant:jar>
- </postGoal>
-
<postGoal name="jar:install">
<ant:property name="jardir__"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
<ant:mkdir dir="${jardir__}"/>
- <ant:copy
- file="${basedir}/target/log4j-service-${pom.currentVersion}.jar"
- todir="${jardir__}"
- overwrite="true"
- />
</postGoal>
- <postGoal name="java:compile">
- <!-- generate the version properties file -->
- <j:new var="now" className="java.util.Date"/>
- <j:new var="dateFormat" className="java.text.SimpleDateFormat">
- <j:arg type="java.lang.String" value="yyyy.MM.dd"/>
- </j:new>
- <j:new var="timeFormat" className="java.text.SimpleDateFormat">
- <j:arg type="java.lang.String" value="HH:mm:ss.SSSZ"/>
- </j:new>
- <j:new var="yearFormat" className="java.text.SimpleDateFormat">
- <j:arg type="java.lang.String" value="yyyy"/>
- </j:new>
- <ant:echo
file="${basedir}/target/classes/org/apache/geronimo/core/serverinfo/geronimo-version.properties">#####
Generated by Maven ####
-version=${pom.currentVersion}
-build.date=${dateFormat.format(now)}
-build.time=${timeFormat.format(now)}
-copyright=Copyright (C) 2003-${yearFormat.format(now)}, The Apache Software
Foundation
-</ant:echo>
- </postGoal>
-
- <postGoal name="jar:jar">
- <!-- build the server-info jar -->
- <ant:jar
destfile="${basedir}/target/server-info-${pom.currentVersion}.jar">
- <fileset dir="${basedir}/target/classes"
includes="org/apache/geronimo/core/serverinfo/**/*"/>
- <fileset dir="${basedir}/src/etc/serverinfo"
includes="META-INF/geronimo-service.xml"/>
- </ant:jar>
- </postGoal>
-
- <postGoal name="jar:install">
- <ant:property name="jardir__"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${jardir__}"/>
- <ant:copy
- file="${basedir}/target/server-info-${pom.currentVersion}.jar"
- todir="${jardir__}"
- overwrite="true"
- />
- </postGoal>
</project>
1.44 +1 -2 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- project.xml 12 Feb 2004 08:18:21 -0000 1.43
+++ project.xml 12 Feb 2004 18:17:17 -0000 1.44
@@ -153,7 +153,6 @@
<url>http://jakarta.apache.org/log4j</url>
<properties>
<runtime>false</runtime>
- <log4j-service>true</log4j-service>
</properties>
</dependency>
