bodewig 2002/07/31 07:47:38
Modified: proposal/gump/profile gump.xml
proposal/gump/project jakarta-slide.xml jakarta-taglibs.xml
java-xml-pack.xml xml-commons.xml xml-crimson.xml
xml-xerces.xml xml-xerces2.xml
Removed: proposal/gump/project jaxp.xml
Log:
"Upgrade" to JAXP 1.2.
Crimson and Xerces-J2 have changed their roles as Xerces is now the RI
for JAXP, therefore Xerces will be built against Crimson and Crimson
built against JAXP. After that, almost everything has been left
untouched.
Revision Changes Path
1.108 +3 -3 jakarta-alexandria/proposal/gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/profile/gump.xml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gump.xml 31 Jul 2002 13:08:28 -0000 1.107
+++ gump.xml 31 Jul 2002 14:47:38 -0000 1.108
@@ -141,7 +141,7 @@
<module href="project/jaf.xml"/>
<module href="project/javamail.xml"/>
<module href="project/java-xml-pack.xml"/>
- <module href="project/jaxp.xml"/>
+ <!-- module href="project/jaxp.xml"/ -->
<module href="project/jdbc.xml"/>
<module href="project/jdo.xml"/>
<module href="project/jms.xml"/>
@@ -169,10 +169,10 @@
<project name="javacc" package="javacc2.1"/>
<project name="javamail" package="javamail-1.2"/>
<project name="jaxm" package="java_xml_pack-summer-02"/>
- <project name="jaxp-1.2" package="java_xml_pack-summer-02"/>
+ <project name="jaxp" package="java_xml_pack-summer-02"/>
<project name="jaxr" package="java_xml_pack-summer-02"/>
<project name="jaxrpc" package="java_xml_pack-summer-02"/>
- <project name="jaxp" package="jaxp-1.1"/>
+ <!-- project name="jaxp" package="jaxp-1.1"/ -->
<project name="jce" package="jce"/>
<project name="jdbc" package="jdbc2_0"/>
<project name="jdo" package="jdori-1_0-fcs"/>
1.34 +3 -1 jakarta-alexandria/proposal/gump/project/jakarta-slide.xml
Index: jakarta-slide.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-slide.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-slide.xml 31 Jul 2002 13:29:33 -0000 1.33
+++ jakarta-slide.xml 31 Jul 2002 14:47:38 -0000 1.34
@@ -13,7 +13,9 @@
<ant target="full-dist">
<property name="ant.jar" reference="jarpath" project="dist-ant"
id="ant" />
- <property name="jaxp.lib" reference="home" project="jaxp"/>
+ <depend property="jaxp.jar" project="jaxp" id="jaxp-api"/>
+ <depend property="xmlparser.jar" project="xml-xerces" id="parser"/>
+ <depend property="xmlapi.jar" project="xml-apis" />
<property name="jmx.jar" reference="jarpath" project="jmx" id="jmxri"/>
<depend name="jdom.jar" project="jdom"/>
<property name="struts.lib" project="jakarta-struts" path="dist/lib"/>
1.40 +3 -3 jakarta-alexandria/proposal/gump/project/jakarta-taglibs.xml
Index: jakarta-taglibs.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-taglibs.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jakarta-taglibs.xml 31 Jul 2002 13:29:33 -0000 1.39
+++ jakarta-taglibs.xml 31 Jul 2002 14:47:38 -0000 1.40
@@ -18,9 +18,9 @@
<depend property="xerces.jar" project="xml-xerces" id="parser"/>
<depend property="crimson.jar" project="xml-xerces" id="parser"/>
<depend property="jaxp.jar" project="xml-xerces" id="apis"/>
- <depend property="jaxp-api.jar" project="jaxp-1.2" id="jaxp-api"/>
- <depend property="dom.jar" project="jaxp-1.2" id="dom"/>
- <depend property="sax.jar" project="jaxp-1.2" id="sax"/>
+ <depend property="jaxp-api.jar" project="jaxp" id="jaxp-api"/>
+ <depend property="dom.jar" project="jaxp" id="dom"/>
+ <depend property="sax.jar" project="jaxp" id="sax"/>
<depend property="xercesImpl.jar" project="xml-xerces" id="parser"/>
<depend property="xalan.jar" project="xml-xalan2"/>
<depend property="servlet.jar" project="jakarta-servletapi-4"/>
1.3 +1 -1 jakarta-alexandria/proposal/gump/project/java-xml-pack.xml
Index: java-xml-pack.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/java-xml-pack.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-xml-pack.xml 31 Jul 2002 13:08:28 -0000 1.2
+++ java-xml-pack.xml 31 Jul 2002 14:47:38 -0000 1.3
@@ -11,7 +11,7 @@
<jar name="jaxm-1.1/lib/jaxm-api.jar" id="jaxm-api" />
</project>
- <project name="jaxp-1.2">
+ <project name="jaxp">
<package>javax.xml</package>
<jar name="jaxp-1.2/jaxp-api.jar" id="jaxp-api" />
1.14 +2 -2 jakarta-alexandria/proposal/gump/project/xml-commons.xml
Index: xml-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-commons.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xml-commons.xml 20 Jul 2002 06:11:25 -0000 1.13
+++ xml-commons.xml 31 Jul 2002 14:47:38 -0000 1.14
@@ -22,7 +22,7 @@
<project name="xml-commons-which">
<package>org.apache.env</package>
<ant basedir="java" buildfile="which.xml" target="jar" />
- <depend project="jaxp" ids="apis parser" />
+ <depend project="xml-xerces" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="which.jar"/>
1.8 +3 -3 jakarta-alexandria/proposal/gump/project/xml-crimson.xml
Index: xml-crimson.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-crimson.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xml-crimson.xml 26 Mar 2002 13:48:32 -0000 1.7
+++ xml-crimson.xml 31 Jul 2002 14:47:38 -0000 1.8
@@ -13,11 +13,11 @@
<ant target="dist">
<property name="build.dir" value="build"/>
</ant>
- <depend project="xml-xerces"/>
+ <depend project="jaxp" ids="jaxp-api dom sax parser" />
<depend project="bootstrap-ant"/>
- <home parent="build/crimson"/>
<javadoc nested="build/docs/api"/>
- <jar nested="crimson.jar"/>
+ <home nested="build"/>
+ <jar name="crimson.jar"/>
<nag from="Sam Ruby <[EMAIL PROTECTED]>"
to="[EMAIL PROTECTED]"/>
</project>
1.19 +1 -1 jakarta-alexandria/proposal/gump/project/xml-xerces.xml
Index: xml-xerces.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xml-xerces.xml 20 Jul 2002 06:11:25 -0000 1.18
+++ xml-xerces.xml 31 Jul 2002 14:47:38 -0000 1.19
@@ -11,7 +11,7 @@
<project name="xml-xerces1">
<ant basedir="java" target="jar"/>
- <depend project="jaxp" ids="apis parser" />
+ <depend project="jaxp"/>
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
1.22 +1 -1 jakarta-alexandria/proposal/gump/project/xml-xerces2.xml
Index: xml-xerces2.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces2.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xml-xerces2.xml 20 Jul 2002 06:11:25 -0000 1.21
+++ xml-xerces2.xml 31 Jul 2002 14:47:38 -0000 1.22
@@ -13,7 +13,7 @@
<package>org.apache.xerces</package>
<ant basedir="java" target="jars"/>
- <depend project="jaxp" ids="apis parser" />
+ <depend project="xml-crimson" />
<depend project="bootstrap-ant"/>
<home nested="java/build"/>
<jar name="xercesImpl.jar" id="parser"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>