You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/06/28 09:46:29 UTC
svn commit: r958492 - in /gump/metadata/project: cocoon3.xml xml-xalan.xml
Author: bodewig
Date: Mon Jun 28 07:46:28 2010
New Revision: 958492
URL: http://svn.apache.org/viewvc?rev=958492&view=rev
Log:
create Xalan's bundled jar which contains BCEL and CUP and other things because this is what projects currently find as xalan inside the mvn repo
Modified:
gump/metadata/project/cocoon3.xml
gump/metadata/project/xml-xalan.xml
Modified: gump/metadata/project/cocoon3.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/cocoon3.xml?rev=958492&r1=958491&r2=958492&view=diff
==============================================================================
--- gump/metadata/project/cocoon3.xml (original)
+++ gump/metadata/project/cocoon3.xml Mon Jun 28 07:46:28 2010
@@ -136,7 +136,7 @@
<option project="commons-logging"/>
<option project="commons-validator"/>
<option project="junit"/>
- <option project="xalan"/>
+ <option project="xalan-bundled"/>
<option project="xml-apis"/>
<option project="xmlunit"/>
</project>
Modified: gump/metadata/project/xml-xalan.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xml-xalan.xml?rev=958492&r1=958491&r2=958492&view=diff
==============================================================================
--- gump/metadata/project/xml-xalan.xml (original)
+++ gump/metadata/project/xml-xalan.xml Mon Jun 28 07:46:28 2010
@@ -24,13 +24,6 @@
<svn repository="asf" dir="xalan/java/trunk"/>
- <!-- Name has changed to 'xalan' to match the Maven repository name.
- xml-xalan2 is kept for compatibility.
- -->
- <project name="xml-xalan2">
- <depend project="xalan" inherit="jars" />
- </project>
-
<project name="xalan" groupId="xalan">
<package>org.apache.xalan</package>
@@ -50,7 +43,7 @@
<work nested="build/serializer"/>
<home nested="build"/>
- <jar name="xalan-unbundled.jar" type="boot" id="xalan" />
+ <jar name="xalan-unbundled.jar" type="boot" id="xalan-unbundled" />
<jar name="serializer.jar" id="serializer" type="boot" />
<!-- we can't have the same jar with two ids -->
@@ -60,6 +53,31 @@
to="xalan-dev@xml.apache.org"/>
</project>
+ <project name="xalan-bundled" groupId="xalan">
+ <package>org.apache.xalan</package>
+
+ <ant target="jar">
+ <property name="build.sysclasspath" value="last" />
+ </ant>
+
+ <depend project="bcel" runtime="true"/>
+ <depend project="bootstrap-ant"/>
+ <depend project="java_cup" runtime="true"/>
+ <depend project="jaxp" ids="xalan"/>
+ <depend project="jlex" runtime="true"/>
+ <depend project="xalan"/>
+ <depend project="xml-apis"/>
+ <depend project="xml-xerces"/>
+ <work nested="build/classes"/>
+ <work nested="build/serializer"/>
+
+ <home nested="build"/>
+ <jar name="xalan.jar" type="boot" id="xalan" />
+
+ <nag from="Sam Ruby <rubys@us.ibm.com>"
+ to="xalan-dev@xml.apache.org"/>
+ </project>
+
<project name="xsltc">
<package>org.apache.xalan</package>
@@ -75,13 +93,33 @@
<work nested="build/serializer"/>
<home nested="build"/>
- <jar name="xsltc.jar" type="boot" id="xsltc" />
- <jar name="serializer.jar" id="serializer" type="boot" />
+ <jar name="xsltc.jar" type="boot" id="xsltc-unbundled" />
<nag from="Sam Ruby <rubys@us.ibm.com>"
to="xalan-dev@xml.apache.org"/>
</project>
+ <project name="xsltc-bundled">
+ <package>org.apache.xalan</package>
+
+ <ant target="xsltc.jar"/>
+
+ <depend project="bcel" runtime="true"/>
+ <depend project="bootstrap-ant"/>
+ <depend project="java_cup" runtime="true"/>
+ <depend project="jlex" runtime="true"/>
+ <depend project="xml-apis"/>
+ <depend project="xml-xerces"/>
+ <depend project="xsltc"/>
+ <work nested="build/classes"/>
+ <work nested="build/serializer"/>
+
+ <home nested="build"/>
+ <jar name="xsltc.jar" type="boot" id="xsltc" />
+ <nag from="Sam Ruby <rubys@us.ibm.com>"
+ to="xalan-dev@xml.apache.org"/>
+ </project>
+
<project name="dist-xalan2">
<ant target="dist-nodocs">
<property name="version" value="@@DATE@@"/>
@@ -106,45 +144,6 @@
to="xalan-dev@xml.apache.org"/>
</project>
- <!-- moved to a different directory in svn -->
- <!--project name="xml-xalan2-smoketest-tools">
- <description>
- Independent testing harness org.apache.qetest
- </description>
- <ant basedir="test" buildfile="qetest.xml" target="jar"/>
-
- <depend project="ant" inherit="runtime"/>
- <depend project="xml-apis"/>
- <depend project="xml-xerces"/>
- <depend project="xalan"/>
-
- <home nested="test/java/build"/>
- <jar name="qetest.jar"/>
- <nag from="Sam Ruby <rubys@us.ibm.com>"
- to="xalan-dev@xml.apache.org"/>
- </project>
-
- <project name="xml-xalan2-smoketest">
- <url href="http://xml.apache.org/xalan-j/test/"/>
- <description>
- Automated smoketests for Xalan-J 2.x
- </description>
- <ant basedir="test" target="smoketest.gump">
- <property name="ant.build.clonevm" value="true"/>
- </ant>
-
- <depend project="ant" inherit="runtime"/>
- <depend project="xml-apis"/>
- <depend project="xml-xerces"/>
- <depend project="xalan"/>
- <depend project="xml-xalan2-smoketest-tools"/>
- <depend project="jtidy"/>
- <work nested="test/java/build"/>
- <work nested="test/tests/extensions/java/build"/>
- <nag from="Sam Ruby <rubys@us.ibm.com>"
- to="xalan-dev@xml.apache.org"/>
- </project-->
-
<project name="xalan2jdoc">
<jar name="tools/xalan2jdoc.jar"/>
</project>