zongaro 2004/02/25 20:00:47
Modified: java build.xml
java/src/org/apache/xalan/xslt EnvironmentCheck.java
java/src/org/apache/xalan/processor XSLProcessorVersion.java
java/src/org/apache/xalan Version.java
Log:
Patch for bug report 27205 from Sarah McNamara (mcnamara () ca ! ibm ! com).
Version number updates for Xalan-Java 2.6.0 release.
Revision Changes Path
1.205 +8 -7 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- build.xml 22 Feb 2004 15:20:43 -0000 1.204
+++ build.xml 26 Feb 2004 04:00:47 -0000 1.205
@@ -86,9 +86,9 @@
<!-- Defines general variables used by the other targets; name controls
output xalan.jar -->
<property name="version.VERSION" value="2"/>
- <property name="version.RELEASE" value="5"/>
+ <property name="version.RELEASE" value="6"/>
<property name="version.DEVELOPER" value=""/><!-- Set this to 'D' if a
developer release; blank "" if maintenance release -->
- <property name="version.MINOR" value="2"/><!-- EITHER the developer
release number, or a maintenance release number -->
+ <property name="version.MINOR" value="0"/><!-- EITHER the developer
release number, or a maintenance release number -->
<property name="version"
value="${version.VERSION}_${version.RELEASE}_${version.DEVELOPER}${version.MINOR}"/><!--
GUMP: version # of dist file -->
<property name="impl.version"
value="${version.VERSION}.${version.RELEASE}.${version.DEVELOPER}${version.MINOR}"/><!--
Used in jar task for filtering MANIFEST.MF file -->
<property name="name" value="xalan"/><!-- GUMP: base name of jar target's
file -->
@@ -817,7 +817,7 @@
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
- <target name="docs" depends="jar,docs.nojardepends"/>
+ <target name="docs" depends="jar,docs.nojardepends,xsltc.docs"/>
<target name="docs.nojardepends"
depends="prepare.docs.nojardepends,autodocs"
description="Build the documentation (overview, readme, etc.)" >
@@ -1125,7 +1125,7 @@
</copy>
<copy todir="${dist.dir}">
- <fileset dir="."
includes="readme.html,KEYS,License,build.xml,build.sh,build.bat,xsltc_todo.xml,todo.xsl,commits.xml"/>
+ <fileset dir="."
includes="readme.html,KEYS,LICENSE,NOTICE,build.xml,build.sh,build.bat,xsltc_todo.xml,todo.xsl,commits.xml"/>
</copy>
<!-- Build separate -src and -bin distros for both .zip and .tar.gz -->
@@ -1214,11 +1214,12 @@
<!-- ===================================================================
-->
<!-- Creates the documentation tree for the org.apache.xml website
-->
<!-- ===================================================================
-->
- <target name="site" depends="prepare.docs.nojardepends"
+ <target name="site" depends="prepare.docs.nojardepends, xsltc.docs"
description="Build documentation for posting to the website" >
<mkdir dir="${site.dir}/apidocs"/>
<mkdir dir="${site.dir}/design"/>
+ <mkdir dir="${site.dir}/xsltc"/>
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
1.26 +8 -6
xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java
Index: EnvironmentCheck.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- EnvironmentCheck.java 23 Feb 2004 10:29:35 -0000 1.25
+++ EnvironmentCheck.java 26 Feb 2004 04:00:47 -0000 1.26
@@ -1223,7 +1223,8 @@
jarVersions.put(new Long(108484), "xml-apis.jar from xalan-j_2_3_0, or
xalan-j_2_3_1 from xml-commons-1.0.b2");
jarVersions.put(new Long(109049), "xml-apis.jar from xalan-j_2_4_0 from
xml-commons RIVERCOURT1 branch");
jarVersions.put(new Long(113749), "xml-apis.jar from xalan-j_2_4_1 from
factoryfinder-build of xml-commons RIVERCOURT1");
- jarVersions.put(new Long(124704), "xml-apis.jar from tck-jaxp-1_2_0
branch of xml-commons");
+ jarVersions.put(new Long(124704), "xml-apis.jar from tck-jaxp-1_2_0
branch of xml-commons");
+ jarVersions.put(new Long(124724), "xml-apis.jar from tck-jaxp-1_2_0
branch of xml-commons, tag: xml-commons-external_1_2_01");
// If the below were more common I would update it to report
// errors better; but this is so old hardly anyone has it
@@ -1247,7 +1248,8 @@
jarVersions.put(new Long(972027), "xercesImpl.jar from xalan-j_2_4_0
from xerces-2_1");
jarVersions.put(new Long(831587), "xercesImpl.jar from xalan-j_2_4_1
from xerces-2_2");
jarVersions.put(new Long(891817), "xercesImpl.jar from xalan-j_2_5_D1
from xerces-2_3");
- jarVersions.put(new Long(895924), "xercesImpl.jar from xerces-2_4");
+ jarVersions.put(new Long(895924), "xercesImpl.jar from xerces-2_4");
+ jarVersions.put(new Long(1010806), "xercesImpl.jar from
Xerces-J-bin.2.6.2");
jarVersions.put(new Long(37485), "xalanj1compat.jar from xalan-j_2_0_0");
jarVersions.put(new Long(38100), "xalanj1compat.jar from xalan-j_2_0_1");
1.49 +3 -3
xml-xalan/java/src/org/apache/xalan/processor/XSLProcessorVersion.java
Index: XSLProcessorVersion.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLProcessorVersion.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- XSLProcessorVersion.java 11 Feb 2004 18:15:51 -0000 1.48
+++ XSLProcessorVersion.java 26 Feb 2004 04:00:47 -0000 1.49
@@ -69,7 +69,7 @@
* - API or behaviour change.
* - its designated as a reference release.
*/
- public static final int RELEASE = 5;
+ public static final int RELEASE = 6;
/**
* Maintenance Drop Number.
@@ -80,7 +80,7 @@
* When missing, it designates the final and complete
* development drop for a release.
*/
- public static final int MAINTENANCE = 2;
+ public static final int MAINTENANCE = 0;
/**
* Development Drop Number.
1.12 +151 -151 xml-xalan/java/src/org/apache/xalan/Version.java
Index: Version.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/Version.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Version.java 11 Feb 2004 05:10:06 -0000 1.11
+++ Version.java 26 Feb 2004 04:00:47 -0000 1.12
@@ -1,151 +1,151 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id$
- */
-package org.apache.xalan;
-
-/**
- * Administrative class to keep track of the version number of
- * the Xalan release.
- * <P>This class implements the upcoming standard of having
- * org.apache.project-name.Version.getVersion() be a standard way
- * to get version information. This class will replace the older
- * org.apache.xalan.processor.Version class.</P>
- * <P>See also: org/apache/xalan/res/XSLTInfo.properties for
- * information about the version of the XSLT spec we support.</P>
- * @xsl.usage general
- */
-public class Version
-{
-
- /**
- * Get the basic version string for the current Xalan release.
- * Version String formatted like
- * <CODE>"<B>Xalan</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
- *
- * Futurework: have this read version info from jar manifest.
- *
- * @return String denoting our current version
- */
- public static String getVersion()
- {
- return getProduct()+" "+getImplementationLanguage()+" "
- +getMajorVersionNum()+"."+getReleaseVersionNum()+"."
- +( (getDevelopmentVersionNum() > 0) ?
- ("D"+getDevelopmentVersionNum()) :
(""+getMaintenanceVersionNum()));
- }
-
- /**
- * Print the processor version to the command line.
- *
- * @param argv command line arguments, unused.
- */
- public static void main(String argv[])
- {
- System.out.println(getVersion());
- }
-
- /**
- * Name of product: Xalan.
- */
- public static String getProduct()
- {
- return "Xalan";
- }
-
- /**
- * Implementation Language: Java.
- */
- public static String getImplementationLanguage()
- {
- return "Java";
- }
-
-
- /**
- * Major version number.
- * Version number. This changes only when there is a
- * significant, externally apparent enhancement from
- * the previous release. 'n' represents the n'th
- * version.
- *
- * Clients should carefully consider the implications
- * of new versions as external interfaces and behaviour
- * may have changed.
- */
- public static int getMajorVersionNum()
- {
- return 2;
-
- }
-
- /**
- * Release Number.
- * Release number. This changes when:
- * - a new set of functionality is to be added, eg,
- * implementation of a new W3C specification.
- * - API or behaviour change.
- * - its designated as a reference release.
- */
- public static int getReleaseVersionNum()
- {
- return 5;
- }
-
- /**
- * Maintenance Drop Number.
- * Optional identifier used to designate maintenance
- * drop applied to a specific release and contains
- * fixes for defects reported. It maintains compatibility
- * with the release and contains no API changes.
- * When missing, it designates the final and complete
- * development drop for a release.
- */
- public static int getMaintenanceVersionNum()
- {
- return 2;
- }
-
- /**
- * Development Drop Number.
- * Optional identifier designates development drop of
- * a specific release. D01 is the first development drop
- * of a new release.
- *
- * Development drops are works in progress towards a
- * compeleted, final release. A specific development drop
- * may not completely implement all aspects of a new
- * feature, which may take several development drops to
- * complete. At the point of the final drop for the
- * release, the D suffix will be omitted.
- *
- * Each 'D' drops can contain functional enhancements as
- * well as defect fixes. 'D' drops may not be as stable as
- * the final releases.
- */
- public static int getDevelopmentVersionNum()
- {
- try {
- if ((new String("")).length() == 0)
- return 0;
- else
- return Integer.parseInt("");
- } catch (NumberFormatException nfe) {
- return 0;
- }
- }
-}
+/*
+ * Copyright 2003-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * $Id$
+ */
+package org.apache.xalan;
+
+/**
+ * <meta name="usage" content="general"/>
+ * Administrative class to keep track of the version number of
+ * the Xalan release.
+ * <P>This class implements the upcoming standard of having
+ * org.apache.project-name.Version.getVersion() be a standard way
+ * to get version information. This class will replace the older
+ * org.apache.xalan.processor.Version class.</P>
+ * <P>See also: org/apache/xalan/res/XSLTInfo.properties for
+ * information about the version of the XSLT spec we support.</P>
+ */
+public class Version
+{
+
+ /**
+ * Get the basic version string for the current Xalan release.
+ * Version String formatted like
+ * <CODE>"<B>Xalan</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
+ *
+ * Futurework: have this read version info from jar manifest.
+ *
+ * @return String denoting our current version
+ */
+ public static String getVersion()
+ {
+ return getProduct()+" "+getImplementationLanguage()+" "
+ +getMajorVersionNum()+"."+getReleaseVersionNum()+"."
+ +( (getDevelopmentVersionNum() > 0) ?
+ ("D"+getDevelopmentVersionNum()) :
(""+getMaintenanceVersionNum()));
+ }
+
+ /**
+ * Print the processor version to the command line.
+ *
+ * @param argv command line arguments, unused.
+ */
+ public static void main(String argv[])
+ {
+ System.out.println(getVersion());
+ }
+
+ /**
+ * Name of product: Xalan.
+ */
+ public static String getProduct()
+ {
+ return "Xalan";
+ }
+
+ /**
+ * Implementation Language: Java.
+ */
+ public static String getImplementationLanguage()
+ {
+ return "Java";
+ }
+
+
+ /**
+ * Major version number.
+ * Version number. This changes only when there is a
+ * significant, externally apparent enhancement from
+ * the previous release. 'n' represents the n'th
+ * version.
+ *
+ * Clients should carefully consider the implications
+ * of new versions as external interfaces and behaviour
+ * may have changed.
+ */
+ public static int getMajorVersionNum()
+ {
+ return 2;
+
+ }
+
+ /**
+ * Release Number.
+ * Release number. This changes when:
+ * - a new set of functionality is to be added, eg,
+ * implementation of a new W3C specification.
+ * - API or behaviour change.
+ * - its designated as a reference release.
+ */
+ public static int getReleaseVersionNum()
+ {
+ return 6;
+ }
+
+ /**
+ * Maintenance Drop Number.
+ * Optional identifier used to designate maintenance
+ * drop applied to a specific release and contains
+ * fixes for defects reported. It maintains compatibility
+ * with the release and contains no API changes.
+ * When missing, it designates the final and complete
+ * development drop for a release.
+ */
+ public static int getMaintenanceVersionNum()
+ {
+ return 0;
+ }
+
+ /**
+ * Development Drop Number.
+ * Optional identifier designates development drop of
+ * a specific release. D01 is the first development drop
+ * of a new release.
+ *
+ * Development drops are works in progress towards a
+ * compeleted, final release. A specific development drop
+ * may not completely implement all aspects of a new
+ * feature, which may take several development drops to
+ * complete. At the point of the final drop for the
+ * release, the D suffix will be omitted.
+ *
+ * Each 'D' drops can contain functional enhancements as
+ * well as defect fixes. 'D' drops may not be as stable as
+ * the final releases.
+ */
+ public static int getDevelopmentVersionNum()
+ {
+ try {
+ if ((new String("")).length() == 0)
+ return 0;
+ else
+ return Integer.parseInt("");
+ } catch (NumberFormatException nfe) {
+ return 0;
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
