You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2023/01/21 13:20:10 UTC

[xalan-java] branch xalan-j_2_7_1_maint updated: xalanj commit : committing improvements for, XalanJ tests configuration for src distribution. Committing changes to XalanJ readme file, and documentation meta-data file as well.

This is an automated email from the ASF dual-hosted git repository.

mukulg pushed a commit to branch xalan-j_2_7_1_maint
in repository https://gitbox.apache.org/repos/asf/xalan-java.git


The following commit(s) were added to refs/heads/xalan-j_2_7_1_maint by this push:
     new f2cc86d8 xalanj commit : committing improvements for, XalanJ tests configuration for src distribution. Committing changes to XalanJ readme file, and documentation meta-data file as well.
f2cc86d8 is described below

commit f2cc86d867e7545bf5b99bba8b198fafd3d76e3f
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat Jan 21 18:49:56 2023 +0530

    xalanj commit : committing improvements for, XalanJ tests configuration
    for src distribution. Committing changes to XalanJ readme file, and
    documentation meta-data file as well.
---
 README                         |  17 +++--
 build_srcdist_xalan_tests.xml  | 137 +++++++++++++++++++++++++++++------------
 xdocs/sources/xalan/readme.xml |  10 +--
 3 files changed, 115 insertions(+), 49 deletions(-)

diff --git a/README b/README
index 5af6f917..490ffc88 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ the file testxsl.jar that acts as main XalanJ test driver, within folder xalan-t
 
 4) Run the necessary XalanJ tests as follows,
 
-The tests described below within points 4.1, 4.2 and 4.3 need to be run from folder xalan-test. 
+The tests described below within points 4.1, 4.2, 4.3 and 4.4 need to be run from folder xalan-test. 
 
 4.1 Run the ant target "smoketest", using following three commands in sequence shown below
 
@@ -93,8 +93,17 @@ The output of the command "build smoketest" should be following, and without any
 
 smoketest-pass:
      [echo]  [minitest] CONGRATULATIONS! The Smoketest passed!
+     
+4.2 Run the ant target "api", using following command
+
+build api
+
+The output of the command "build api" should be following, and without any other build errors,
+
+apitest-pass:
+     [echo]  [minitest] CONGRATULATIONS! The api tests passed!     
 
-4.2 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below 
+4.3 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below 
 
 build conf.xsltc
 
@@ -107,7 +116,7 @@ The output of the command "build smoketest.xsltc" should be following, and witho
 smoketest.xsltc-pass:
      [echo]  [minitest] CONGRATULATIONS! The Smoketest passed!
 
-4.3 Run the ant target "smoketest.dev", using following command
+4.4 Run the ant target "smoketest.dev", using following command
 
 build smoketest.dev
 
@@ -116,7 +125,7 @@ The output of the command "build smoketest.dev" should be following, and without
 smoketest-pass:
      [echo]  [minitest] CONGRATULATIONS! The Smoketest passed!
      
-4.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file 
+4.5 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file 
 xsltc_int_truncation_test.bat (provided for Windows platform) to run test for, 
 "XalanJ integer truncation bug fix, when using XSLTC".    
      
\ No newline at end of file
diff --git a/build_srcdist_xalan_tests.xml b/build_srcdist_xalan_tests.xml
index c1e99056..aafcad77 100644
--- a/build_srcdist_xalan_tests.xml
+++ b/build_srcdist_xalan_tests.xml
@@ -358,7 +358,7 @@ file build.xml provided by XalanJ xalan-test git repos.
     <!-- ================================================================== -->
     <target name="init.test"
         description="Prepare timestamp, echo version for debugging">
-        <echo message="Using parserjar ${parserjar} build.xml:$Revision$" />
+    	<echo message="Using parserjar ${parserjar}" />
         <tstamp />
     </target>
 
@@ -398,18 +398,20 @@ file build.xml provided by XalanJ xalan-test git repos.
     <!-- ================================================================== -->
     <!-- Run tests: the normal StylesheetTestletDriver on the conf suite    -->
     <!-- ================================================================== -->
-    <target name="conf" description="Run TestletDriver over the conf tree"
-        depends="init.test">
-        <!-- Set the default conformance test driver, user may override -->
-        <property name="testClass" value="org.apache.qetest.xsl.StylesheetTestletDriver" />
-        <echo message="Executing Xalan conf test: ${testClass}" />
-        <property name="testType" value="conf." />
-        <antcall target="run.xalantest">
-            <param name="xalantest.classpathref" value="conf.class.path" />
-        </antcall>
-        <property name="scan.outputDir" value="${conf.outputDir}"/>
-        <antcall target="scan"/>
-    </target>
+	<target name="conf" description="Run TestletDriver over the conf tree"
+	        depends="init.test">
+	    <!-- Set the default conformance test driver, user may override -->
+	    <property name="testClass" value="org.apache.qetest.xsl.StylesheetTestletDriver" />
+	    <echo message="Executing Xalan conf test: ${testClass}" />
+	    <property name="testType" value="conf." />
+	    <mkdir dir="results-conf"/>
+	    <antcall target="run.xalantest">
+	       <param name="xalantest.classpathref" value="conf.class.path" />
+	    </antcall>
+	    <!--<property name="scan.outputDir" value="${conf.outputDir}"/>-->
+	    <property name="scan.outputDir" value="results-conf"/>
+	    <antcall target="scan"/>
+	</target>
 
     <target name="conf.dom" description="Run TestletDriver over conf with DOM excludes">
         <antcall target="conf">
@@ -492,7 +494,7 @@ file build.xml provided by XalanJ xalan-test git repos.
         <property name="testType" value="accept.xsltc." />
         <property name="qetest.summaryFile" value="Accept.xml" />
         <property name="scan.outputDir" value="${accept.xsltc.outputDir}"/>
-	<property name="use-processor" value="${accept.xsltc.processor}"/>
+	    <property name="use-processor" value="${accept.xsltc.processor}"/>
         <antcall target="conf.xsltc" />
     </target>
 
@@ -587,18 +589,61 @@ file build.xml provided by XalanJ xalan-test git repos.
     <!-- ================================================================== -->
     <!-- Run tests: a specific named API test                               -->
     <!-- ================================================================== -->
-    <target name="api" description="Run a specific API test"
-        depends="init.test">
-        <!-- Note no default is set; also testClass is not prefixed! -->
-        <echo message="Executing Xalan api test: ${testClass}" />
-        <property name="testType" value="api." />
-        <antcall target="run.xalantest">
-            <param name="xalantest.classpathref" value="api.class.path" />
-        </antcall>
-        <antcall target="scan">
-            <param name="scan.outputDir" value="${api.outputDir}"/>
-        </antcall>
-    </target>
+	<target name="api" description="Run a specific API test"
+	        depends="init.test">
+	        <!-- Note no default is set; also testClass is not prefixed! -->
+	        <!--<echo message="Executing Xalan api test: ${testClass}" />-->
+	        <property name="testClass" value="org.apache.qetest.xsl.XSLTestHarness" />
+	        <property name="testType" value="api." />
+	        <mkdir dir="results-api"/>
+	        <antcall target="run.xalantest">
+	            <param name="xalantest.classpathref" value="api.class.path" />
+	        </antcall>
+	        <condition property="apitest-passed">
+	            <and>
+	               <available file="results-api/Pass-DOMResultAPITest.xml" />
+	               <available file="results-api/Pass-DOMSourceAPITest.xml" />
+	               <available file="results-api/Pass-DTMDumpTest.xml" />
+	               <available file="results-api/Pass-EmbeddedStylesheetTest.xml" />
+	               <available file="results-api/Pass-ErrorListenerAPITest.xml" />
+	               <available file="results-api/Pass-ErrorListenerTest.xml" />
+	               <available file="results-api/Pass-FactoryFeatureTest.xml" />
+	               <available file="results-api/Pass-OutputPropertiesTest.xml" />
+	               <available file="results-api/Pass-OutputSettingsTest.xml" />
+	               <available file="results-api/Pass-ParameterTest.xml" />
+	               <available file="results-api/Pass-PrefixResolverAPITest.xml" />
+	               <available file="results-api/Pass-ProgrammaticDOMTest.xml" />
+	               <available file="results-api/Pass-SAXResultAPITest.xml" />
+	               <available file="results-api/Pass-SAXSourceAPITest.xml" />
+	               <available file="results-api/Pass-SAXTransformerFactoryAPITest.xml" />
+	               <available file="results-api/Pass-SerializedStylesheetTest.xml" />
+	               <available file="results-api/Pass-StreamResultAPITest.xml" />
+	               <available file="results-api/Pass-StreamSourceAPITest.xml" />
+	               <available file="results-api/Pass-SystemIdImpInclTest.xml" />
+	               <available file="results-api/Pass-SystemIDResolverAPITest.xml" />
+	               <available file="results-api/Pass-SystemIdTest.xml" />
+	               <available file="results-api/Pass-TemplatesAPITest.xml" />
+	               <available file="results-api/Pass-TemplatesHandlerAPITest.xml" />
+	               <available file="results-api/Pass-TestDTM.xml" />
+	               <available file="results-api/Pass-TestDTMIter.xml" />
+	               <available file="results-api/Pass-TestDTMTrav.xml" />
+	               <available file="results-api/Pass-TestXPathAPI.xml" />
+	               <available file="results-api/Pass-TraceListenerTest.xml" />
+	               <available file="results-api/Pass-TransformerAPITest.xml" />
+	               <available file="results-api/Pass-TransformerFactoryAPITest.xml" />
+	               <available file="results-api/Pass-TransformerHandlerAPITest.xml" />
+	               <available file="results-api/Pass-TransformerHandlerTest.xml" />
+	               <available file="results-api/Pass-TransformStateAPITest.xml" />
+	               <available file="results-api/Pass-TransformStateTest.xml" />
+	               <available file="results-api/Pass-URIResolverTest.xml" />
+	            </and>
+	        </condition>       
+	        <antcall target="scan">
+	            <!--<param name="scan.outputDir" value="${api.outputDir}"/>-->
+	            <param name="scan.outputDir" value="results-api"/>
+	        </antcall>
+	        <antcall target="apitest-pass"/>
+	    </target>
 
     <!-- ================================================================== -->
     <!-- Run tests: Run all available API tests                             -->
@@ -728,10 +773,14 @@ file build.xml provided by XalanJ xalan-test git repos.
     <!-- Run tests: Run the Xalan-J 2.x Smoketest, including several tests  -->
     <!-- Note: this target is frequently called from outside of this file!  -->
     <!-- ================================================================== -->
-    <target name="smoketest" 
+    <!--<target name="smoketest" 
             description="Run the Xalan-J 2.x Smoketest"
             depends="minitest-execute,extensions.classes,smoketest-execute,minitest-notpass,minitest-pass,smoketest-notpass,smoketest-pass">
-    </target>
+    </target>-->
+	<target name="smoketest" 
+	        description="Run the Xalan-J 2.x Smoketest"
+	        depends="smoketest-execute,smoketest-notpass,smoketest-pass">
+	</target>
     <target name="smoketest.xsltc" 
             description="Run the Xalan-J 2.x XSLTC Smoketest"
             depends="jar,smoketest.xsltc-execute,smoketest.xsltc-notpass,smoketest.xsltc-pass">
@@ -777,28 +826,28 @@ file build.xml provided by XalanJ xalan-test git repos.
             <param name="testType" value="smoketest.conf."/>
         </antcall>
 
-        <echo message="About to execute Accept tests..." />
+        <!--<echo message="About to execute Accept tests..." />
         <antcall target="accept">
             <param name="testType" value="smoketest.accept."/>
-        </antcall>
+        </antcall>-->
 
-        <echo message="About to execute other API tests..." />
-        <antcall target="api">
-            <param name="testClass" value="org.apache.qetest.xsl.XSLTestHarness"/>
-            <param name="testType" value="smoketest.api."/>
-        </antcall>
+    	<!--<echo message="About to execute other API tests..." />
+    	<antcall target="api">
+    	   <param name="testClass" value="org.apache.qetest.xsl.XSLTestHarness"/>
+    	   <param name="testType" value="smoketest.api."/>
+    	</antcall>-->
 
-        <echo message="About to execute XalanJ2 extensions tests..." />
+        <!--<echo message="About to execute XalanJ2 extensions tests..." />
         <antcall target="extensions">
             <param name="testType" value="smoketest.extensions."/>
-        </antcall>
+        </antcall>-->
 
         <condition property="smoketest-passed">
             <and>
                 <available file="${smoketest.conf.passFile}" />
-                <available file="${smoketest.accept.passFile}" />
-                <available file="${smoketest.api.passFile}" />
-                <available file="${smoketest.extensions.passFile}" />
+                <!--<available file="${smoketest.accept.passFile}" />-->
+                <!--<available file="${smoketest.api.passFile}" />-->
+                <!--<available file="${smoketest.extensions.passFile}" />-->
             </and>
         </condition>
         <antcall target="scan">
@@ -838,8 +887,14 @@ file build.xml provided by XalanJ xalan-test git repos.
     </target>
     <target name="smoketest-pass" if="smoketest-passed">
         <echo message=" [minitest] CONGRATULATIONS! The Smoketest passed!" />
-        <echo message=" [minitest] Details are in ${smoketest.conf.logFile}, ${smoketest.api.logFile}, ${smoketest.extensions.logFile}" />
+        <!--<echo message=" [minitest] Details are in ${smoketest.conf.logFile}, ${smoketest.api.logFile}, ${smoketest.extensions.logFile}" />
+        -->
+    	<echo message=" [minitest] Details are in ${smoketest.conf.logFile}" />
     </target>
+	
+	<target name="apitest-pass" if="apitest-passed">
+	    <echo message=" [minitest] CONGRATULATIONS! The api tests passed!" />
+	</target>
 
     <target name="smoketest.xsltc-notpass" unless="smoketest.xsltc-passed">
         <echo message=" [minitest] ERROR! The Smoketest failed!" />
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index baa908af..de66a016 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -39,15 +39,17 @@
   <s2 title="Release notes for &xslt4j; 2.7.3">
     <p>
       &xslt4j; 2.7.3 was released in January 2023.
-    </p>    
+    </p>
+    <s3 title="Java 8 requirement">
+       This XalanJ release, requires users to use Java minimum version 8 to use XalanJ.
+    </s3>    
     <s3 title="Fix for CVE-2022-34169 An integer truncation issue when processing malicious XSLT stylesheets">
        This issue was fixed within XalanJ's XSLTC processor. This XalanJ issue, when present causes following problems:
        Malicious XSLT stylesheets may be written, which could result in XalanJ invalid translet Java byte code to be produced 
        by XalanJ XSLTC processor.
     </s3>    
     <s3 title="Upgrade to Apache Commons BCEL 6.7.0">
-       This XalanJ release, contains upgraded version of Apache Commons 
-       BCEL library [Gary Gregory].
+       This XalanJ release, contains upgraded version of Apache Commons BCEL library [Gary Gregory].
     </s3>
     <s3 title="Enhancements for, performing XalanJ build and running of XalanJ tests from source distribution">
        The XalanJ users, can now make XalanJ builds and perform XalanJ tests from the XalanJ source 
@@ -56,7 +58,7 @@
     <s3 title="Upgrade to Xerces-J 2.12.2">
        This XalanJ release, contains upgraded versions of <code>xercesImpl.jar</code>
        and <code>xml-apis.jar</code> (Xerces-J 2.12.2).
-    </s3>    
+    </s3>        
     <s3 title="XALANJ Jira bug fixes">
       <p>XALANJ Jira bug fixes:
         <jump href="https://issues.apache.org/jira/browse/XALANJ-2638">2638</jump>,                


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org