[Mulgara-svn] r644 - in trunk: . lib src/jar/itql src/jar/rdql src/jar/server-http
ronald at mulgara.org
ronald at mulgara.org
Mon Feb 18 11:14:23 UTC 2008
Author: ronald
Date: 2008-02-18 03:14:23 -0800 (Mon, 18 Feb 2008)
New Revision: 644
Added:
trunk/lib/log4j-1.2.15.jar
Removed:
trunk/lib/log4j-1.2.8.jar
Modified:
trunk/build.properties
trunk/build.xml
trunk/common.properties
trunk/common.xml
trunk/src/jar/itql/build.xml
trunk/src/jar/rdql/build.xml
trunk/src/jar/server-http/build.xml
Log:
Moved to latest log4j which besides many bugfixes has a TRACE level too.
Needed to bump the memory for tests a bit because (at least on 64-bit jvm's)
we were running close to the limit and the new log4j just pushed us over it
during the jxunit tests (30M extra would've been enough, but gave 128M more).
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/build.properties 2008-02-18 11:14:23 UTC (rev 644)
@@ -133,7 +133,7 @@
jotm.iiop.jar =jotm_iiop_stubs-1.5.3.jar
jotm.jar =jotm-1.5.3-patched.jar
l2fprod-common-sheet.jar =l2fprod-common-sheet.jar
-log4j.jar =log4j-1.2.8.jar
+log4j.jar =log4j-1.2.15.jar
lucene.jar =lucene-2.0.0.jar
mail.jar =mail-1.3.jar
saaj.jar =saaj-1.1.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/build.xml 2008-02-18 11:14:23 UTC (rev 644)
@@ -175,7 +175,7 @@
<pathelement path="${dist.dir}/${driver.jar}"/>
<pathelement path="${dist.dir}/${ant-task.jar}"/>
<pathelement path="${lib.dir}/apache-soap-2.2.jar"/>
- <pathelement path="${lib.dir}/log4j-1.2.8.jar"/>
+ <pathelement path="${lib.dir}/log4j-1.2.15.jar"/>
</classpath>
</taskdef>
@@ -193,7 +193,7 @@
<pathelement path="${dist.dir}/${driver.jar}"/>
<pathelement path="${dist.dir}/${ant-task.jar}"/>
<pathelement path="${lib.dir}/apache-soap-2.2.jar"/>
- <pathelement path="${lib.dir}/log4j-1.2.8.jar"/>
+ <pathelement path="${lib.dir}/log4j-1.2.15.jar"/>
</classpath>
</taskdef>
@@ -491,7 +491,7 @@
lib/${resolver-distributed.jar},
lib/${resolver-jar.jar}, lib/${dtd.jar}, lib/${jrdf.base.jar}
lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar, lib/antlr.jar,
- lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar, lib/log4j-1.2.8.jar, lib/${lucene.jar}, lib/mail-1.3.jar,
+ lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar, lib/log4j-1.2.15.jar, lib/${lucene.jar}, lib/mail-1.3.jar,
lib/${jetty.jar}, lib/${jetty.plus.jar}, lib/${jasper.compiler.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,
lib/castor-0.9.3.9-xml.jar, lib/trove-1.0.2.jar, lib/${jrdf.jar}, lib/${saaj.jar},
lib/${jakarta-oro.jar}, lib/jta-spec1_0_1.jar, lib/${jotm.jar}, lib/${jotm.carol.jar}, lib/${jotm.iiop.jar},
@@ -1910,7 +1910,7 @@
lib/${store-stringpool-memory.jar}, lib/${store-stringpool-xa.jar}, lib/${tuples.jar},lib/${tuples-hybrid.jar},
lib/${util.jar}, lib/${util-xa.jar}, lib/activation-1.0.2.jar,lib/icu4j.jar, lib/jena-2.1.jar, lib/${jid3.jar},
lib/antlr.jar, lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar,lib/connector-1_5.jar,
-lib/${jotm.jar}, lib/${jotm_carol.jar}, lib/${jotm_iiop_stubs.jar},lib/jta-spec1_0_1.jar, lib/log4j-1.2.8.jar, lib/${lucene.jar},
+lib/${jotm.jar}, lib/${jotm_carol.jar}, lib/${jotm_iiop_stubs.jar},lib/jta-spec1_0_1.jar, lib/log4j-1.2.15.jar, lib/${lucene.jar},
lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${jasper.compiler.jar},
lib/${servlet.jar},lib/jargs-0.2.jar, lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar,
lib/trove-1.0.2.jar,lib/${jrdf.jar}, lib/${sofa.jar}, lib/${rules.jar}, lib/${krule.jar}, lib/${saaj.jar}, lib/${axis.jar}, lib/${commons-discovery.jar},
Modified: trunk/common.properties
===================================================================
--- trunk/common.properties 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/common.properties 2008-02-18 11:14:23 UTC (rev 644)
@@ -51,5 +51,5 @@
arch.bits=-Dnoop
# VM argument for component test
-jvm.args=-Xmx512M
+jvm.args=-Xmx640M
Modified: trunk/common.xml
===================================================================
--- trunk/common.xml 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/common.xml 2008-02-18 11:14:23 UTC (rev 644)
@@ -64,7 +64,7 @@
<fileset dir="${lib.dir}" includes="**/axis-1.1.jar"/>
<fileset dir="${lib.dir}" includes="**/axis-ant-1.1.jar"/>
<fileset dir="${lib.dir}" includes="**/wsdl4j-1.4.jar"/>
- <fileset dir="${lib.dir}" includes="**/log4j-1.2.8.jar"/>
+ <fileset dir="${lib.dir}" includes="**/log4j-1.2.15.jar"/>
<fileset dir="${lib.dir}" includes="**/commons-logging-1.0.3.jar"/>
<fileset dir="${lib.dir}" includes="**/commons-discovery-1.2.jar"/>
<fileset dir="${lib.dir}" includes="**/jaxrpc-1.1.jar"/>
Copied: trunk/lib/log4j-1.2.15.jar (from rev 630, trunk/lib/log4j-1.2.8.jar)
===================================================================
(Binary files differ)
Deleted: trunk/lib/log4j-1.2.8.jar
===================================================================
(Binary files differ)
Modified: trunk/src/jar/itql/build.xml
===================================================================
--- trunk/src/jar/itql/build.xml 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/src/jar/itql/build.xml 2008-02-18 11:14:23 UTC (rev 644)
@@ -87,7 +87,7 @@
</manifest>
<manifest file="${obj.dir}/META-INF/MANIFEST_ITQL_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="${query.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.8.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="${query.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.15.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.itql.TqlSession"/>
</manifest>
</target>
@@ -138,7 +138,7 @@
<zipfileset src="${lib.dir}/${jrdf.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/jsr173_07_api.jar" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/jsr173_07_ri.jar" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/log4j-1.2.8.jar" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/log4j-1.2.15.jar" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${saaj.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${emory-util.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jta.jar}" excludes="META-INF/**"/>
Modified: trunk/src/jar/rdql/build.xml
===================================================================
--- trunk/src/jar/rdql/build.xml 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/src/jar/rdql/build.xml 2008-02-18 11:14:23 UTC (rev 644)
@@ -159,7 +159,7 @@
<zipfileset src="${lib.dir}/beepcore-0.9.08.jar" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/jargs-0.2.jar" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jrdf.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/log4j-1.2.8.jar" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/log4j-1.2.15.jar" excludes="META-INF/**"/>
</jar>
</target>
Modified: trunk/src/jar/server-http/build.xml
===================================================================
--- trunk/src/jar/server-http/build.xml 2008-02-18 11:00:45 UTC (rev 643)
+++ trunk/src/jar/server-http/build.xml 2008-02-18 11:14:23 UTC (rev 644)
@@ -150,7 +150,7 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_HTTP_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.8.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
More information about the Mulgara-svn
mailing list