You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/10/17 21:57:35 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xslt EnvironmentCheck.java
curcuru 01/10/17 12:57:35
Modified: java/src/org/apache/xalan/processor XSLProcessorVersion.java
java/src/org/apache/xalan/xslt EnvironmentCheck.java
Added: java/src/org/apache/xalan Version.java
Log:
Added new org.apache.xalan.Version class for better versioning info;
Deprecated org.apache.xalan.processor.XSLProcessorVersion;
Updated EnvironmentCheck with this info
Revision Changes Path
1.1 xml-xalan/java/src/org/apache/xalan/Version.java
Index: Version.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xalan" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, Lotus
* Development Corporation., http://www.lotus.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
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;
// NOTE: In post 2.2 builds, we should remove XSLProcessorVersion
// and simply store this info here or in the build.xml and use
// Ant's filtering capability to replace it here
return org.apache.xalan.processor.XSLProcessorVersion.VERSION;
}
/**
* 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 2;
return org.apache.xalan.processor.XSLProcessorVersion.RELEASE;
}
/**
* 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;
return org.apache.xalan.processor.XSLProcessorVersion.MAINTENANCE;
}
/**
* 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()
{
//return 12;
return org.apache.xalan.processor.XSLProcessorVersion.DEVELOPMENT;
}
}
1.31 +1 -0 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XSLProcessorVersion.java 2001/10/15 17:13:35 1.30
+++ XSLProcessorVersion.java 2001/10/17 19:57:34 1.31
@@ -61,6 +61,7 @@
* Administrative class to keep track of the version number of
* the Xalan release.
* <P>See also: org/apache/xalan/res/XSLTInfo.properties</P>
+ * @deprecated To be replaced by org.apache.xalan.Version.getVersion()
*/
public class XSLProcessorVersion
{
1.8 +29 -19 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EnvironmentCheck.java 2001/09/10 19:13:16 1.7
+++ EnvironmentCheck.java 2001/10/17 19:57:34 1.8
@@ -125,7 +125,7 @@
* Xalan, DOM/SAX/JAXP, etc. are not present.</p>
*
* @author Shane_Curcuru@lotus.com
- * @version $Id: EnvironmentCheck.java,v 1.7 2001/09/10 19:13:16 curcuru Exp $
+ * @version $Id: EnvironmentCheck.java,v 1.8 2001/10/17 19:57:34 curcuru Exp $
*/
public class EnvironmentCheck
{
@@ -294,7 +294,7 @@
boolean errors = false;
logMsg(
- "#---- BEGIN writeEnvironmentReport($Revision: 1.7 $): Useful properties found: ----");
+ "#---- BEGIN writeEnvironmentReport($Revision: 1.8 $): Useful properties found: ----");
// Fake the Properties-like output
for (Enumeration enum = h.keys();
@@ -450,7 +450,7 @@
try
{
Element envCheckNode = factory.createElement("EnvironmentCheck");
- envCheckNode.setAttribute("version", "$Revision: 1.7 $");
+ envCheckNode.setAttribute("version", "$Revision: 1.8 $");
container.appendChild(envCheckNode);
if (null == h)
@@ -780,6 +780,7 @@
jarVersions.put(new Long(702536), "xalan.jar from xalan-j_2_0_0");
jarVersions.put(new Long(720930), "xalan.jar from xalan-j_2_0_1");
jarVersions.put(new Long(872241), "xalan.jar from xalan-j_2_2_D10");
+ jarVersions.put(new Long(882739), "xalan.jar from xalan-j_2_2_D11");
jarVersions.put(new Long(857171), "xalan.jar from lotusxsl-j_1_0_1");
jarVersions.put(new Long(802165), "xalan.jar from lotusxsl-j_2_0_0");
jarVersions.put(new Long(857692), "xalan.jar from lotusxsl-j_2_2");
@@ -798,7 +799,7 @@
jarVersions.put(new Long(1787796), "xerces.jar from lotusxsl-j_2_2 or xerces-1_4_1.bin");
jarVersions.put(new Long(904030), "xerces.jar from xerces-1_4_0.bin");
jarVersions.put(new Long(1802885), "xerces.jar from xerces-1_4_2.bin");
- jarVersions.put(new Long(1808883), "xerces.jar from xalan-j_2_2_D10 or xerces-1_4_3.bin");
+ jarVersions.put(new Long(1808883), "xerces.jar from xalan-j_2_2_D10,D11,D12 or xerces-1_4_3.bin");
jarVersions.put(new Long(1803877), "xerces.jar from XML4J-3_2_1");
jarVersions.put(new Long(37485), "xalanj1compat.jar from xalan-j_2_0_0");
@@ -902,9 +903,9 @@
}
else
{
-
// We couldn't even find the class, and don't have
- // any JAXP support at all
+ // any JAXP support at all, or only have the
+ // transform half of it
h.put(ERROR + VERSION + "JAXP", CLASS_NOTPRESENT);
h.put(ERROR, ERROR_FOUND);
}
@@ -955,31 +956,40 @@
try
{
+ // NOTE: This is the old Xalan 2.0, 2.1, 2.2 version class,
+ // is being replaced by class below
final String XALAN2_VERSION_CLASS =
"org.apache.xalan.processor.XSLProcessorVersion";
Class clazz = Class.forName(XALAN2_VERSION_CLASS);
// Found Xalan-J 2.x, grab it's version fields
StringBuffer buf = new StringBuffer();
- Field f = clazz.getField("PRODUCT");
-
- buf.append(f.get(null));
- buf.append(";");
-
- f = clazz.getField("LANGUAGE");
-
+ Field f = clazz.getField("S_VERSION");
buf.append(f.get(null));
- buf.append(";");
- f = clazz.getField("S_VERSION");
+ h.put(VERSION + "xalan2x", buf.toString());
+ }
+ catch (Exception e2)
+ {
+ h.put(VERSION + "xalan2x", CLASS_NOTPRESENT);
+ }
+ try
+ {
+ // NOTE: This is the new Xalan 2.2+ version class
+ final String XALAN2_2_VERSION_CLASS =
+ "org.apache.xalan.Version";
+ final String XALAN2_2_VERSION_METHOD = "getVersion";
+ final Class noArgs[] = new Class[0];
+
+ Class clazz = Class.forName(XALAN2_2_VERSION_CLASS);
+ Method method = clazz.getMethod(XALAN2_2_VERSION_METHOD, noArgs);
+ Object returnValue = method.invoke(null, new Object[0]);
- buf.append(f.get(null));
- buf.append(";");
- h.put(VERSION + "xalan2", buf.toString());
+ h.put(VERSION + "xalan2_2", (String)returnValue);
}
catch (Exception e2)
{
- h.put(VERSION + "xalan2", CLASS_NOTPRESENT);
+ h.put(VERSION + "xalan2_2", CLASS_NOTPRESENT);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org