dain 2004/02/12 23:12:56
Modified: assembly maven.xml
Log:
Log4j.properties files are no longer included in the startup jars
Revision Changes Path
1.8 +2 -6 incubator-geronimo/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 12 Feb 2004 21:15:51 -0000 1.7
+++ maven.xml 13 Feb 2004 07:12:56 -0000 1.8
@@ -94,8 +94,6 @@
<!-- Create the server.jar file used to run the server-->
<ant:mkdir dir="target/bin"/>
<ant:jar destfile="target/bin/server.jar">
- <!-- include the log4j.properties file from the kernel module -->
- <fileset file="../modules/kernel/src/conf/log4j.properties"/>
<manifest>
<attribute name="Main-Class"
value="org.apache.geronimo.Geronimo"/>
<attribute name="Class-Path" value="${server.classpath}"/>
@@ -104,8 +102,6 @@
<!-- Create the deploy.jar file used to deploy things -->
<ant:jar destfile="target/bin/deploy.jar">
- <!-- include the log4j.properties file from the kernel module -->
- <fileset file="../modules/kernel/src/conf/log4j.properties"/>
<manifest>
<attribute name="Main-Class"
value="org.apache.geronimo.deployment.Deployer"/>
<attribute name="Class-Path" value="${deploy.classpath}"/>
@@ -155,7 +151,7 @@
<deploy:deploy
deployconfigid="org/apache/geronimo/Server"
deployoutfile="target/config/server.car"
-
deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/log4j-service-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/server-info-${pom.currentVersion}.jar"/>
+
deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/loglog4j-service-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/server-info-${pom.currentVersion}.jar"/>
<ant:echo message="did deploy:server"/>
-->
</goal>
