[Jpackage-commits] dist/xalan-j2/JPP-6 .cvsignore, 1.3, 1.4 pom-serializer.xml, NONE, 1.1 pom-xalan.xml, NONE, 1.1 sources, 1.3, 1.4 xalan-j2-XALANJ-2195.patch, NONE, 1.1 xalan-j2-XALANJ-2321-AVT.patch, 1.1, 1.2 xalan-j2-XALANJ-2376.patch, 1.2, 1.3 xalan-j2-XALANJ-2382.patch, NONE, 1.1 xalan-j2-XALANJ-2535.patch, NONE, 1.1 xalan-j2-crosslink.patch, 1.1, 1.2 xalan-j2-enable-xsltc.patch, NONE, 1.1 xalan-j2-manifest.patch, 1.1, 1.2 xalan-j2-noxsltcdeps.patch, 1.1, 1.2 xalan-j2-stylesheets-xmlns-redirect.patch, NONE, 1.1 xalan-j2.spec, 1.14, 1.15

David Walluck david at ryu.zarb.org
Tue Oct 18 22:07:30 CEST 2011


Update of /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv24481

Modified Files:
	.cvsignore sources xalan-j2-XALANJ-2321-AVT.patch 
	xalan-j2-XALANJ-2376.patch xalan-j2-crosslink.patch 
	xalan-j2-manifest.patch xalan-j2-noxsltcdeps.patch 
	xalan-j2.spec 
Added Files:
	pom-serializer.xml pom-xalan.xml xalan-j2-XALANJ-2195.patch 
	xalan-j2-XALANJ-2382.patch xalan-j2-XALANJ-2535.patch 
	xalan-j2-enable-xsltc.patch 
	xalan-j2-stylesheets-xmlns-redirect.patch 
Log Message:
- port most changes to JPackage


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	29 Jul 2009 02:47:06 -0000	1.3
--- .cvsignore	18 Oct 2011 20:07:28 -0000	1.4
***************
*** 1 ****
! xalan-j_2_7_1-src.tar.gz
--- 1 ----
! xalan-j2-2.7.1.tar.bz2

Index: xalan-j2-manifest.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-manifest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xalan-j2-manifest.patch	3 Jun 2008 16:29:07 -0000	1.1
--- xalan-j2-manifest.patch	18 Oct 2011 20:07:28 -0000	1.2
***************
*** 1,4 ****
! --- src/MANIFEST.MF.sav	2007-02-12 13:39:18.000000000 +0100
! +++ src/MANIFEST.MF	2007-02-12 13:40:07.000000000 +0100
  @@ -1,8 +1,6 @@
   Manifest-Version: 1.0
--- 1,5 ----
! diff -up xalan-j_2_7_1/src/MANIFEST.MF.orig xalan-j_2_7_1/src/MANIFEST.MF
! --- xalan-j_2_7_1/src/MANIFEST.MF.orig	2011-06-07 15:59:05.838135757 -0400
! +++ xalan-j_2_7_1/src/MANIFEST.MF	2011-06-07 16:02:28.603389617 -0400
  @@ -1,8 +1,6 @@
   Manifest-Version: 1.0
***************
*** 10,14 ****
   Name: org/apache/xalan/
   Comment: Main Xalan engine implementing TrAX/JAXP
! @@ -38,33 +36,3 @@
   Implementation-Vendor: Apache Software Foundation
   Implementation-URL: http://xml.apache.org/xalan-j/
--- 11,15 ----
   Name: org/apache/xalan/
   Comment: Main Xalan engine implementing TrAX/JAXP
! @@ -38,33 +36,3 @@ Implementation-Version: @impl.version@
   Implementation-Vendor: Apache Software Foundation
   Implementation-URL: http://xml.apache.org/xalan-j/
***************
*** 44,59 ****
  -Implementation-URL: http://jakarta.apache.org/regexp
  -
! --- src/MANIFEST.SERIALIZER.sav	2007-02-12 13:39:24.000000000 +0100
! +++ src/MANIFEST.SERIALIZER	2007-02-12 13:40:15.000000000 +0100
  @@ -1,7 +1,6 @@
!  Manifest-Version: 1.0
!  Created-By: @java.version@ (@java.vendor@)
!  Main-Class: org.apache.xml.serializer.Version
! -Class-Path: xml-apis.jar
!  
!  Name: org/apache/xml/serializer/
!  Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
! --- src/manifest.xalan-interpretive.sav	2007-02-12 13:39:31.000000000 +0100
! +++ src/manifest.xalan-interpretive	2007-02-12 13:40:24.000000000 +0100
  @@ -1,7 +1,6 @@
   Manifest-Version: 1.0
--- 45,62 ----
  -Implementation-URL: http://jakarta.apache.org/regexp
  -
! diff -up xalan-j_2_7_1/src/MANIFEST.SERIALIZER.orig xalan-j_2_7_1/src/MANIFEST.SERIALIZER
! --- xalan-j_2_7_1/src/MANIFEST.SERIALIZER.orig	2005-01-10 17:07:58.000000000 -0500
! +++ xalan-j_2_7_1/src/MANIFEST.SERIALIZER	2011-08-31 18:05:54.548287632 -0400
  @@ -1,7 +1,6 @@
!  Manifest-Version: 1.0
!  Created-By: @java.version@ (@java.vendor@)
!  Main-Class: org.apache.xml.serializer.Version
! -Class-Path: xml-apis.jar
!  
!  Name: org/apache/xml/serializer/
!  Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
! diff -up xalan-j_2_7_1/src/manifest.xalan-interpretive.orig xalan-j_2_7_1/src/manifest.xalan-interpretive
! --- xalan-j_2_7_1/src/manifest.xalan-interpretive.orig	2011-06-07 16:09:53.010135749 -0400
! +++ xalan-j_2_7_1/src/manifest.xalan-interpretive	2011-06-07 16:10:56.751388768 -0400
  @@ -1,7 +1,6 @@
   Manifest-Version: 1.0
***************
*** 64,69 ****
   Name: org/apache/xalan/
   Comment: Main Xalan engine implementing TrAX/JAXP
! --- src/manifest.xsltc.sav	2007-02-12 13:39:37.000000000 +0100
! +++ src/manifest.xsltc	2007-02-12 13:40:43.000000000 +0100
  @@ -1,6 +1,5 @@
   Manifest-Version: 1.0
--- 67,73 ----
   Name: org/apache/xalan/
   Comment: Main Xalan engine implementing TrAX/JAXP
! diff -up xalan-j_2_7_1/src/manifest.xsltc.orig xalan-j_2_7_1/src/manifest.xsltc
! --- xalan-j_2_7_1/src/manifest.xsltc.orig	2011-06-07 16:04:11.612135682 -0400
! +++ xalan-j_2_7_1/src/manifest.xsltc	2011-06-07 16:05:32.851136361 -0400
  @@ -1,6 +1,5 @@
   Manifest-Version: 1.0
***************
*** 73,77 ****
   Name: org/apache/xalan/xsltc/
   Comment: Main XSLTC engine implementing TrAX/JAXP
! @@ -19,33 +18,3 @@
   Implementation-Vendor: Apache Software Foundation
   Implementation-URL: http://xml.apache.org/xalan-j/dist/
--- 77,81 ----
   Name: org/apache/xalan/xsltc/
   Comment: Main XSLTC engine implementing TrAX/JAXP
! @@ -19,33 +18,3 @@ Implementation-Version: @impl.version@
   Implementation-Vendor: Apache Software Foundation
   Implementation-URL: http://xml.apache.org/xalan-j/dist/

Index: xalan-j2-XALANJ-2376.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-XALANJ-2376.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** xalan-j2-XALANJ-2376.patch	29 Jul 2009 06:22:10 -0000	1.2
--- xalan-j2-XALANJ-2376.patch	18 Oct 2011 20:07:28 -0000	1.3
***************
*** 1,11 ****
! --- src/org/apache/xalan/processor/TransformerFactoryImpl.java.orig	2009-07-29 12:45:51.000000000 +0800
! +++ src/org/apache/xalan/processor/TransformerFactoryImpl.java	2009-07-29 12:46:44.000000000 +0800
  @@ -1001,7 +1001,7 @@
!    }
!  
!    /** The error listener.   */
! -  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(false);
! +  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(true);
!  
!    /**
!     * Get the error listener in effect for the TransformerFactory.
--- 1,11 ----
! --- xalan-j2/src/org/apache/xalan/processor/TransformerFactoryImpl.java.orig	2009-07-29 12:45:51.000000000 +0800
! +++ xalan-j2/src/org/apache/xalan/processor/TransformerFactoryImpl.java	2009-07-29 12:46:44.000000000 +0800
  @@ -1001,7 +1001,7 @@
!    }
!  
!    /** The error listener.   */
! -  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(false);
! +  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(true);
!  
!    /**
!     * Get the error listener in effect for the TransformerFactory.

--- NEW FILE: xalan-j2-XALANJ-2195.patch ---
--- xalan-j2/src/org/apache/xml/utils/XMLReaderManager.java.orig	2010-10-12 12:53:08.263175752 -0400
+++ xalan-j2/src/org/apache/xml/utils/XMLReaderManager.java	2010-10-12 12:57:57.362354719 -0400
@@ -152,10 +152,16 @@
      * @param reader The XMLReader that's being released.
      */
     public synchronized void releaseXMLReader(XMLReader reader) {
+        // To avoid NullPointerException if reader is null
+        if (reader == null) {
+            return;
+        } 
         // If the reader that's being released is the cached reader
-        // for this thread, remove it from the m_isUse list.
-        if (m_readers.get() == reader && reader != null) {
-            m_inUse.remove(reader);
+        // for this thread, mark it as no longer being in use.
+        if (m_readers.get() == reader) {
+           m_readers.set(null);
+           m_inUse.put(reader, Boolean.FALSE);
         }
+        m_inUse.remove(reader); 
     }
 }

Index: xalan-j2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** xalan-j2.spec	18 Oct 2011 18:45:55 -0000	1.14
--- xalan-j2.spec	18 Oct 2011 20:07:28 -0000	1.15
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 28,45 ****
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with bootstrap
! %bcond_without repolib
  
! %define reltag patch02
! %define repodir %{_javadir}/repository.jboss.com/apache-xalan/%{version}.%{reltag}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
! %define section free
  
  %global cvs_version 2_7_1
--- 28,44 ----
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %bcond_with bootstrap 
! %bcond_without jbossorg
! %bcond_with repolib
  
! %define section free
  
! %define reltag .jbossorg
! %define namedreltag .jbossorg
  
! %global namedversion %{version}%{?namedreltag}
! %global repodir %{_javadir}/repository.jboss.com/apache-xalan/%{namedversion}-brew
! %global repodirlib %{repodir}/lib
! %global repodirsrc %{repodir}/src
  
  %global cvs_version 2_7_1
***************
*** 47,72 ****
  Name:           xalan-j2
  Version:        2.7.1
! Release:	3%{?dist}
  Epoch:          0
  Summary:        Java XSLT processor
  License:        ASL 2.0
! Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_%{cvs_version}-src.tar.gz
  Source1:        xalan-j2-2.7.0-component-info.xml
! #Patch0:         %{name}-noxsltcdeps.patch
! #Patch1:         %{name}-manifest.patch
! #Patch2:         %{name}-crosslink.patch
  # Fix the XALANJ-2376:
  #TransformerFactory.newTransformer(source) returns null instead throwing
  #an exception and according to the specs newTransformer() should not
  #return null.
! Patch3:         %{name}-XALANJ-2376.patch
! # has been merged into 2.7.1 sources
! #Patch4:         %{name}-XALANJ-2321-AVT.patch
! URL:            http://xalan.apache.org/
! Group:          Text Processing/Markup/XML
  Provides:       jaxp_transform_impl
! Requires:       jaxp_parser_impl
  Requires(post): %{_sbindir}/update-alternatives
  Requires(preun): %{_sbindir}/update-alternatives
  BuildRequires:  ant
  BuildRequires:  java-devel
--- 46,92 ----
  Name:           xalan-j2
  Version:        2.7.1
! Release:        7%{?reltag}%{?dist}
  Epoch:          0
  Summary:        Java XSLT processor
  License:        ASL 2.0
! URL:            http://xalan.apache.org/
! Group:          Text Processing/Markup/XML
! %if 0
! git clone https://github.com/jboss/xalan-j.git && cd xalan-j && git config --local core.autocrlf false && git archive --prefix=xalan-j2-2.7.1/ --format=tar b482c102d3011eb7d05d | bzip2 -9 > ../xalan-j2-2.7.1.tar.bz2
! %endif
! %if 0
! svn export -r 1163820 http://svn.apache.org/repos/asf/xalan/java/tags/xalan-j_2_7_1 xalan-j2-2.7.1 && tar cjf xalan-j2-2.7.1.tar.bz2 xalan-j2-2.7.1/
! %endif
! Source0:        xalan-j2-2.7.1.tar.bz2
  Source1:        xalan-j2-2.7.0-component-info.xml
! Source2:        pom-xalan.xml
! Source3:        pom-serializer.xml
! Patch0:         xalan-j2-build_xml.patch
  # Fix the XALANJ-2376:
  #TransformerFactory.newTransformer(source) returns null instead throwing
  #an exception and according to the specs newTransformer() should not
  #return null.
! Patch1:         xalan-j2-XALANJ-2376.patch
! # Has been merged into 2.7.1 sources
! # PatchX:       xalan-j2-XALANJ-2321-AVT.patch
! # JBPTP-177 Upgrade xalan-j2 from 2.7.1.patch02 to 2.7.1.patch03
! Patch2:         xalan-j2-XALANJ-2382.patch
! # JBPAPP-5230 CLONE -Patch Xalan for XALANJ-2195
! # JBPAPP-5231 Upgrade Xalan to 2.7.1.patch04
! Patch3:         xalan-j2-XALANJ-2195.patch
! Patch4:         xalan-j2-crosslink.patch
! Patch5:         xalan-j2-enable-xsltc.patch  
! Patch6:         xalan-j2-manifest.patch      
! # FIXME We just enabled xsltc with Patch5, should we use the patch below?
! Patch7:         xalan-j2-noxsltcdeps.patch   
! Patch8:         xalan-j2-stylesheets-xmlns-redirect.patch
! Patch9:         xalan-j2-XALANJ-2535.patch
  Provides:       jaxp_transform_impl
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
  Requires(post): %{_sbindir}/update-alternatives
  Requires(preun): %{_sbindir}/update-alternatives
+ Requires:       jaxp_parser_impl
+ Requires:       jpackage-utils
  BuildRequires:  ant
  BuildRequires:  java-devel
***************
*** 75,85 ****
  BuildRequires:  xerces-j2 >= 0:2.7.1
  BuildRequires:  xml-commons-jaxp-1.3-apis
  %if %without bootstrap
- BuildRequires:  java-cup
  BuildRequires:  bcel
  BuildRequires:  jlex
  BuildRequires:  regexp
  BuildRequires:  sed
! BuildRequires:  servlet_2_4_api
  BuildRequires:  xml-stylebook
  %endif
--- 95,108 ----
  BuildRequires:  xerces-j2 >= 0:2.7.1
  BuildRequires:  xml-commons-jaxp-1.3-apis
+ BuildRequires:  maven2-plugin-deploy
  %if %without bootstrap
  BuildRequires:  bcel
+ BuildRequires:  brazil
+ BuildRequires:  ejb_api
+ BuildRequires:  java-cup
  BuildRequires:  jlex
  BuildRequires:  regexp
  BuildRequires:  sed
! BuildRequires:  servlet_api
  BuildRequires:  xml-stylebook
  %endif
***************
*** 94,270 ****
  in other program.
  
- %if %with repolib
- %package repolib
- Summary:        Artifacts to be uploaded to a repository library
- Group:          Development/Libraries/Java
- 
- %description repolib
- Artifacts to be uploaded to a repository library.
- This package is not meant to be installed but so its contents
- can be extracted through rpm2cpio.
- %endif
- 
  %if %without bootstrap
! %package        xsltc
  Summary:        XSLT compiler
  Group:          Text Processing/Markup/XML
- Requires:       java-cup
  Requires:       bcel
  Requires:       jlex
  Requires:       regexp
  Requires:       jaxp_parser_impl
  
! %description    xsltc
  The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
  lightweight and portable Java byte codes called translets.
  %endif
  
! %package        manual
  Summary:        Manual for %{name}
  Group:          Text Processing/Markup/XML
  
! %description    manual
! Documentation for %{name}.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  Javadoc for %{name}.
  
  %if %without bootstrap
! %package        demo
  Summary:        Demo for %{name}
  Group:          Text Processing/Markup/XML
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       servlet_2_4_api
  
! %description    demo
  Demonstrations and samples for %{name}.
  %endif
  
  %prep
! %setup -q -n xalan-j_%{cvs_version}
! #%patch0 -p0
! #%patch1 -p0
! #%patch2 -p0
! %patch3 -p0
! #%patch4 -p0
! # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
! for j in $(find . -name "*.jar"); do
!         #mv $j $j.no
!         rm $j
  done
  
! # FIXME: who knows where the sources are? xalan-j1 ?
! #mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
! #mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
  
  %{__chmod} 0755 samples/extensions/sql/*.sh
  
! %build
  pushd lib
! ln -sf $(build-classpath java-cup-runtime) runtime.jar
! ln -sf $(build-classpath bcel) BCEL.jar
! ln -sf $(build-classpath regexp) regexp.jar
! ln -sf $(build-classpath xerces-j2) xercesImpl.jar
! ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) xml-apis.jar
  popd
  pushd tools
! ln -sf $(build-classpath java-cup) java_cup.jar
! ln -sf $(build-classpath ant) ant.jar
! ln -sf $(build-classpath jlex) JLex.jar
! ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
  popd
! export CLASSPATH=$(build-classpath servlet_2_4_api)
  export OPT_JAR_LIST=:
  %if %with bootstrap
! %{ant} \
!   -Djava.awt.headless=true \
!   -Dapi.j2se=%{_javadocdir}/java \
!   -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \
!   xalan-interpretive.jar
  %else
! %{ant} \
!   -Djava.awt.headless=true \
!   -Dapi.j2se=%{_javadocdir}/java \
!   -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \
!   xalan-interpretive.jar\
!   xsltc.unbundledjar \
!   docs \
!   xsltc.docs \
!   javadocs \
!   samples \
!   servlet
  %endif
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 build/xalan-interpretive.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %if %without bootstrap
! install -p -m 644 build/xsltc.jar \
!   $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
  %endif
! install -p -m 644 build/serializer.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-serializer-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # add a symlink to serializer.jar to match upstream jar naming
! ln -sf %{name}-serializer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/serializer.jar
! ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xalan.jar
  
  %if %without bootstrap
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! # FIXME: (dwalluck): breaks --short-circuit
! rm -rf build/docs/apidocs
  
  # demo
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
! install -p -m 644 build/xalansamples.jar \
!   $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
! install -p -m 644 build/xalanservlet.war \
!   $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-servlet.war
! cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
  
  # fix link between manual and javadoc
! (cd build/docs; ln -sf %{_javadocdir}/%{name}-%{version} apidocs)
  %endif
  
  # jaxp_transform_impl ghost symlink
! ln -s %{_sysconfdir}/alternatives \
!   $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
  
  %if %with repolib
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i 's/@VERSION@/%{version}.%{reltag}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH3} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH4} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/serializer.jar $RPM_BUILD_ROOT%{repodirlib}/serializer.jar
! cp -p $RPM_BUILD_ROOT%{_javadir}/xalan.jar $RPM_BUILD_ROOT%{repodirlib}/xalan.jar
  %endif
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
!   jaxp_transform_impl %{_javadir}/%{name}.jar 30
  
  %preun
--- 117,380 ----
  in other program.
  
  %if %without bootstrap
! %package xsltc
  Summary:        XSLT compiler
  Group:          Text Processing/Markup/XML
  Requires:       bcel
+ Requires:       java_cup
  Requires:       jlex
  Requires:       regexp
  Requires:       jaxp_parser_impl
  
! %description xsltc
  The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
  lightweight and portable Java byte codes called translets.
  %endif
  
! %package manual
  Summary:        Manual for %{name}
  Group:          Text Processing/Markup/XML
  
! %description manual
! Manual for %{name}.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
! %description javadoc
  Javadoc for %{name}.
  
  %if %without bootstrap
! %package demo
  Summary:        Demo for %{name}
  Group:          Text Processing/Markup/XML
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       servlet_api
  
! %description demo
  Demonstrations and samples for %{name}.
  %endif
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
! %setup -q
! pushd xdocs
! for i in `%{__tar} tf xml-site-style.tar.gz | %{__grep} -v '/$'`; do
!     test -e $i && %{__rm} $i
  done
+ %{__tar} xf xml-site-style.tar.gz
+ %{__rm} xml-site-style.tar.gz
+ popd
+ %if %without jbossorg
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %if %without bootstrap
+ %if 0
+ %patch5 -p1
+ %endif
+ %endif
+ %endif
+ %patch4 -p1
+ %if 0
+ %patch6 -p1
+ %endif
+ %patch7 -p1
+ %patch8 -p1
+ %if %without jbossorg
+ %patch9 -p1
+ %endif
+ ## FIXME
+ pushd xdocs
+ %{__tar} czf xml-site-style.tar.gz style
+ popd
  
! %if %without jbossorg
! %{__rm} src/org/apache/xalan/Version.java
! %{__rm} src/org/apache/xml/serializer/Version.java
! %{__rm} xdocs/style/stylesheets/done.xsl
! %{__mkdir} maven
! %{__cp} -p %{SOURCE2} maven/pom-xalan.xml
! %{__cp} -p %{SOURCE3} maven/pom-serializer.xml
! %endif
! 
! # FIXME: who knows where the sources are? xalan-j1?
! %{_bindir}/find -type f -name '*.jar' -and -not \( -name xalan2jdoc.jar -or -name xalan2jtaglet.jar \) | %{_bindir}/xargs -t %{__rm}
! 
! %{__rm} src/xml-commons-external-1.3.02-src.tar.gz
! %{__tar} czf src/xml-commons-external-1.3.02-src.tar.gz --files-from=/dev/null
  
  %{__chmod} 0755 samples/extensions/sql/*.sh
  
! %if %without jbossorg
! %{__cp} -p %{SOURCE2} xalan.pom
! %{__cp} -p %{SOURCE3} serializer.pom
! %endif
! 
! %{__sed} -i -e 's:\r$::g' NOTICE.txt KEYS LICENSE.txt
! 
! %{__sed} -i -e 's:<version>%{version}.*</version>:<version>%{namedversion}</version>:' maven/pom-xalan.xml
! %{__sed} -i -e 's:<version>%{version}.*</version>:<version>%{namedversion}</version>:' maven/pom-serializer.xml
! 
  pushd lib
! ln -s $(build-classpath java_cup-runtime) runtime.jar
! ln -s $(build-classpath bcel) BCEL.jar
! ln -s $(build-classpath regexp) regexp.jar
! ln -s $(build-classpath xerces-j2) xercesImpl.jar
! ln -s $(build-classpath xml-commons-jaxp-1.3-apis) xml-apis.jar
  popd
  pushd tools
! ln -s $(build-classpath java_cup) java_cup.jar
! ln -s $(build-classpath ant) ant.jar
! ln -s $(build-classpath jlex) JLex.jar
! ln -s $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
  popd
! 
! %build
  export OPT_JAR_LIST=:
  %if %with bootstrap
! export CLASSPATH=
! %{ant} -Dimpl.version=%{namedversion} -Djava.awt.headless=true -Dapi.j2se=%{_javadocdir}/java -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 xalan-interpretive.jar
  %else
! export CLASSPATH=`%{_bindir}/build-classpath brazil ejb_api servlet_api`
! %{ant} -Dimpl.version=%{namedversion} -Djava.awt.headless=true -Dapi.j2se=%{_javadocdir}/java -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \
!     -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 distclean xalan-interpretive.jar xsltc.unbundledjar fulldist
  %endif
  
+ export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
+ export URL=file://`pwd`/maven2-brew
+ #export MAVEN_OPTS="-Xms1g -Xmx1g"
+ %if %without bootstrap
+ %{_bindir}/mvn-jpp deploy:deploy-file -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DpomFile=maven/pom-xalan.xml -Dfile=build/xalan.jar -Dsources=build/xalan-sources.jar -DrepositoryId=jboss-releases-repository -Durl=${URL}
+ %else
+ %{_bindir}/mvn-jpp deploy:deploy-file -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DpomFile=maven/pom-xalan.xml -Dfile=build/xalan-interpretive.jar -Dsources=build/xalan-sources.jar -DrepositoryId=jboss-releases-repository -Durl=${URL}
+ %endif
+ %{_bindir}/mvn-jpp deploy:deploy-file -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DpomFile=maven/pom-serializer.xml -Dfile=build/serializer.jar -Dsources=build/serializer-sources.jar -DrepositoryId=jboss-releases-repository -Durl=${URL}
+ %{_bindir}/mvn-jpp deploy:deploy-file -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DpomFile=maven/pom-xalan.xml -Dfile=build/xalan-j_%{cvs_version}-src.zip -Dpackaging=zip -Dclassifier=source-release -DrepositoryId=jboss-releases-repository -Durl=${URL}
+ 
  %install
! %{__rm} -rf %{buildroot}
  
  # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
  %if %without bootstrap
! %{__cp} -p build/xalan.jar %{buildroot}%{_javadir}/xalan-%{namedversion}.jar
! %{__cp} -p build/xsltc.jar %{buildroot}%{_javadir}/xsltc-%{namedversion}.jar
! %else
! %{__cp} -p build/xalan-interpretive.jar %{buildroot}%{_javadir}/xalan-%{namedversion}.jar
  %endif
! %{__cp} -p build/serializer.jar %{buildroot}%{_javadir}/serializer-%{namedversion}.jar
  
  # add a symlink to serializer.jar to match upstream jar naming
! pushd %{buildroot}%{_javadir}
! %{__ln_s} serializer-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-serializer-%{namedversion}.jar
! %{__ln_s} xalan-%{namedversion}.jar %{name}-%{namedversion}.jar
! popd
! 
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}.jar; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} "s|-%{namedversion}||g"`; done)
! 
! # poms
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! # FIXME: deploy bug
! %{__cp} -p maven2-brew/xalan/serializer/*/serializer-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-serializer.pom
! %{__cp} -p maven2-brew/xalan/xalan/*/xalan-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! 
! # depmaps
! %add_to_maven_depmap xalan serializer %{namedversion} JPP serializer
! %add_to_maven_depmap xalan xalan %{namedversion} JPP xalan
! 
! # XXX: old jboss depmaps---should we remove?
! %add_to_maven_depmap apache-xalan serializer %{namedversion} JPP serializer
! %add_to_maven_depmap apache-xalan xalan %{namedversion} JPP xalan
  
  %if %without bootstrap
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__cp} -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  # demo
! %{__mkdir_p} %{buildroot}%{_datadir}/%{name}
! %{__cp} -p build/xalansamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
! %{__cp} -p build/xalanservlet.war %{buildroot}%{_datadir}/%{name}/%{name}-servlet.war
! %{__cp} -pr samples %{buildroot}%{_datadir}/%{name}
  
+ %{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{namedversion}
+ %{__cp} -pr build/docs %{buildroot}%{_docdir}/%{name}-%{namedversion}
+ %{__cp} -p readme.html %{buildroot}%{_docdir}/%{name}-%{namedversion}/docs
+ %{__rm} -r %{buildroot}%{_docdir}/%{name}-%{namedversion}/docs/apidocs
  # fix link between manual and javadoc
! (cd %{buildroot}%{_docdir}/%{name}-%{namedversion}/docs; %{__ln_s} %{_javadocdir}/%{name}-%{namedversion} apidocs)
  %endif
  
  # jaxp_transform_impl ghost symlink
! %if 1
! /bin/touch %{buildroot}%{_javadir}/jaxp_transform_impl.jar
! %else
! %{__ln_s} %{_sysconfdir}/alternatives %{buildroot}%{_javadir}/jaxp_transform_impl.jar
! %endif
  
  %if %with repolib
! %{__mkdir_p} %{buildroot}%{repodir}
! %{__mkdir_p} %{buildroot}%{repodirlib}
! %{__cp} -p %{SOURCE1} %{buildroot}%{repodir}/component-info.xml
! %{__sed} -i 's/@VERSION@/%{namedversion}-brew/g' %{buildroot}%{repodir}/component-info.xml
! tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
! %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
! %{__mkdir_p} %{buildroot}%{repodirsrc}
! %{__cp} -p %{SOURCE0} %{buildroot}%{repodirsrc}
! %if %without jbossorg
! %{__cp} -p %{PATCH0} %{buildroot}%{repodirsrc}
! %{__cp} -p %{PATCH1} %{buildroot}%{repodirsrc}
! %{__cp} -p %{PATCH2} %{buildroot}%{repodirsrc}
! %{__cp} -p %{PATCH3} %{buildroot}%{repodirsrc}
! %endif
! %{__cp} -p %{PATCH4} %{buildroot}%{repodirsrc}
! %if %without jbossorg
! %if %without bootstrap
! %if 0
! %{__cp} -p %{PATCH5} %{buildroot}%{repodirsrc}
! %endif
! %endif
! %endif
! %if 0
! %{__cp} -p %{PATCH6} %{buildroot}%{repodirsrc}
! %endif
! %{__cp} -p %{PATCH7} %{buildroot}%{repodirsrc}
! %{__cp} -p %{PATCH8} %{buildroot}%{repodirsrc}
! %{__cp} -p %{PATCH9} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/serializer.jar %{buildroot}%{repodirlib}/serializer.jar
! %{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-serializer.pom %{buildroot}%{repodirlib}/serializer.pom
! %{__cp} -p %{buildroot}%{_javadir}/xalan.jar %{buildroot}%{repodirlib}/xalan.jar
! %{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom %{buildroot}%{repodirlib}/xalan.pom
! %endif
! 
! %if %with repolib
! %{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com
! %{__cp} -pr maven2-brew %{buildroot}%{_javadir}/repository.jboss.com
  %endif
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %post
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_transform_impl.jar jaxp_transform_impl %{_javadir}/%{name}.jar 30
! %update_maven_depmap
! 
! %postun
! %update_maven_depmap
  
  %preun
***************
*** 276,281 ****
  %if 0
  %post xsltc
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
!   jaxp_transform_impl %{_javadir}/xsltc.jar 10
  
  %preun xsltc
--- 386,390 ----
  %if 0
  %post xsltc
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_transform_impl.jar jaxp_transform_impl %{_javadir}/xsltc.jar 10
  
  %preun xsltc
***************
*** 289,313 ****
  %defattr(0644,root,root,0755)
  %doc KEYS LICENSE.txt NOTICE.txt readme.html
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/%{name}-serializer-%{version}.jar
! %{_javadir}/%{name}-serializer.jar
! %{_javadir}/serializer.jar
! %{_javadir}/xalan.jar
! %ghost %{_javadir}/jaxp_transform_impl.jar
  
  %if %without bootstrap
  %files xsltc
  %defattr(0644,root,root,0755)
! %{_javadir}/xsltc-%{version}.jar
! %{_javadir}/xsltc.jar
  
  %files manual
  %defattr(0644,root,root,0755)
! %doc build/docs/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
--- 398,428 ----
  %defattr(0644,root,root,0755)
  %doc KEYS LICENSE.txt NOTICE.txt readme.html
! %{_javadir}*/%{name}-%{namedversion}.jar
! %{_javadir}*/%{name}.jar
! %{_javadir}*/%{name}-serializer-%{namedversion}.jar
! %{_javadir}*/%{name}-serializer.jar
! %{_javadir}*/serializer-%{namedversion}.jar
! %{_javadir}*/serializer.jar
! %{_javadir}*/xalan-%{namedversion}.jar
! %{_javadir}*/xalan.jar
! %ghost %{_javadir}*/jaxp_transform_impl.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_datadir}/maven2/poms/JPP-%{name}-serializer.pom
! %{_mavendepmapfragdir}/%{name}
  
  %if %without bootstrap
  %files xsltc
  %defattr(0644,root,root,0755)
! %{_javadir}*/xsltc-%{namedversion}.jar
! %{_javadir}*/xsltc.jar
  
  %files manual
  %defattr(0644,root,root,0755)
! %doc %dir %{_docdir}/%{name}-%{namedversion}
! %doc %{_docdir}/%{name}-%{namedversion}/docs
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
  %{_javadocdir}/%{name}
  
***************
*** 315,329 ****
  %defattr(-,root,root,0755)
  %{_datadir}/%{name}
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %dir %{_javadir}
! %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
! * Tue Oct 18 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-3
! - drop GCJ support
  
  * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 2.7.1-2
--- 430,538 ----
  %defattr(-,root,root,0755)
  %{_datadir}/%{name}
+ %endif
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %dir %{_javadir}*
! %exclude %dir %{_javadocdir}
! %{_javadir}*/repository.jboss.com
  %endif
  
  %changelog
! * Tue Oct 18 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-7.jbossorg
! - port most changes to JPackage
! 
! * Thu Sep 22 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-6.8_redhat_1
! - copy maven contents to repolib
! - leave bundled jars so that docs build correctly
! - fix symlinks
! 
! * Wed Aug 31 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-6.7_redhat_1
! - don't change groupId in poms
! - remove old poms
! - use upstream sources
! - add jbossorg poms as additional sources
! - add build patch from jbossorg
! - convert patches to unix format
! - don't patch for version and set property instead
! - apply XALANJ-2535 patch
! - don't apply manifest and xsltc patches
! - use jbossorg sources and poms
! 
! * Wed Aug 31 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-6.6_redhat_1
! - fix wrong-file-end-of-line-encoding
! - add readme.html to docs
! - remove bundled src/xml-commons-external-1.3.02-src.tar.gz
! - patch and recreate xdocs/xml-site-style.tar.gz
! 
! * Wed Aug 31 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-6.5_redhat_1
! - use xalan.jar, not xalan-interpretive.jar, in non-bootstrap mode
! - don't patch to use xsltc in bootstrap mode
! 
! * Mon Aug 29 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-6.4_redhat_1
! - clean build so that lex and cup run
! - perform full build
! - BuildRequires: brazil
! - BuildRequires: ejb_api
! - BuildRequires: servlet_api not servlet_2_5_api
! - fix missing org.apache.xalan.xsltc.trax.TransformerFactoryImpl
! - remove bad upload script, set maven.repo.local for deploy
! - replace ln -sf with ln -s and remove redundant symlinking
! - remove obsolete GCJ support
! - fix mix of tabs and spaces
! - version jars
! - fix manual files
! 
! * Wed Aug 03 2011 Martha Benitez <mbenitez at redhat.com> - 0:2.7.1-6.3_redhat_1
! - Update build_xml.patch to fix release tag
! 
! * Fri Jul 29 2011 Martha Benitez <mbenitez at redhat.com> - 0:2.7.1-6.2_redhat_1
! - Fix release
! 
! * Tue Jun 07 2011 Martha Benitez <mbenitez at redhat.com> - 0:2.7.1-6_1_redhat.1
! - Rebuild
! 
! * Tue Jun 07 2011 Martha Benitez <mbenitez at redhat.com> - 0:2.7.1-6_1_redhat
! - Upgrade to 2.7.1-1-redhat
!  
! * Wed Mar 02 2011 Martha Benitez <mbenitez at redhat.com> - 0:2.7.1-5.3_patch_04
! - Rebuild
! 
! * Thu Feb 24 2011 David Walluck <dwalluck at redhat.com> 0:2.7.1-5.2_patch_04
! - use jboss groupId for xml-apis in poms
! - use full version in poms, maven depmaps, and file/dir names
! - fix full version in component-info.xml
! - fix pom copying to repolib
! - fix repolib dir ownership
! - update xalan-j2-upload.sh to use mvn-jpp
! - update xerces:xercesImpl version in poms to latest
! - remove macros from comments
! 
! * Tue Feb 15 2011 Permaine Cheung <pcheung at redhat.com> - 0:2.7.1-5.1_patch_04
! - Update Release: tag to be newer than the EAP 4 one
! 
! * Fri Jan 21 2011 Permaine Cheung <pcheung at redhat.com> - 0:2.7.1-3.5_patch_04
! - Fix upload.sh
! 
! * Fri Jan 21 2011 Permaine Cheung <pcheung at redhat.com> - 0:2.7.1-3.4_patch_04
! - Add patch for XALANJ-2195 as -patch-04
! - Fix groupId to apache-xalan and add depmap for proper repolib content
! 
! * Thu Dec 02 2010 Yiqiao Wang <yiwang at redhat.com> - 0:2.7.1-3.3
! - Build with Maven 2.2.1
! - Add upload.sh to repolib
! - Fix %%files for signed jars
! - Add content of maven2-brew, add BR mavne-deploy-plugin
! 
! * Mon Jun 07 2010 Permaine Cheung <pcheung at redhat.com> - 0:2.7.1-3.2
! - Rebuild with javac.source and javac.target=1.5 (needed for tomcat6)
! 
! * Thu Apr 01 2010 Martha Benitez <mbenitez at redhat.com> 0:2.7.1-2
! - Add xalan-j2-XALANJ-2382.patch as patch03
! - Add pom.xml files to repolib
! 
! * Wed Jan 13 2010 David Walluck <dwalluck at redhat.com> 0:2.7.1-1.1
! - add real poms to get correct dependencies
  
  * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 2.7.1-2
***************
*** 333,336 ****
--- 542,546 ----
  - 2.7.1
  - Comment Patch0 Patch1 Patch2 Patch4
+ - Change java-cup to java_cup
  
  * Fri May 21 2009 David Walluck <dwalluck at redhat.com> 0:2.7.0-13
***************
*** 356,361 ****
  - remove spurious requirement on gnu-crypto
  - fix License
! - fix duplicate %%changelog
! 
  - properly comment out xsltc scripts
  
--- 566,571 ----
  - remove spurious requirement on gnu-crypto
  - fix License
! - fix duplicate %%changelog section
! - fix macros in %%changelog
  - properly comment out xsltc scripts
  
***************
*** 375,379 ****
  
  * Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp
! - Fix two typos in files section. 
  
  * Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-3jpp
--- 585,589 ----
  
  * Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp
! - Fix two typos in files section.
  
  * Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-3jpp
***************
*** 397,404 ****
  * Thu Aug 26 2004 Ralph Apel <r.ape at r-apel.de> 0:2.6.0-2jpp
  - Build with ant-1.6.2
! - Try with -Djava.awt.headless=true 
  
  * Tue Mar 23 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:2.6.0-1jpp
! - Updated to 2.6.0 
  - Patches supplied by <aleksander.adamowski at altkom.pl>
  
--- 607,614 ----
  * Thu Aug 26 2004 Ralph Apel <r.ape at r-apel.de> 0:2.6.0-2jpp
  - Build with ant-1.6.2
! - Try with -Djava.awt.headless=true
  
  * Tue Mar 23 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:2.6.0-1jpp
! - Updated to 2.6.0
  - Patches supplied by <aleksander.adamowski at altkom.pl>
  
***************
*** 456,460 ****
    - build and provide xsltc in a separate rpm
  
! * Mon Jul 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.1-2jpp 
  - provides jaxp_transform_impl
  - requires jaxp_parser_impl
--- 666,670 ----
    - build and provide xsltc in a separate rpm
  
! * Mon Jul 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.1-2jpp
  - provides jaxp_transform_impl
  - requires jaxp_parser_impl
***************
*** 465,482 ****
  * Wed Jun 26 2002 Henri Gomez <hgomez at users.sourceforge.net> 2.3.1-2jpp
  - fix built classpath (bsf, bcel are existing jpackage rpms),
- - add buildrequires for javacup and JLex
- 
- * Wed May 08 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.1-1jpp 
  - 2.3.1
  - vendor, distribution, group tags
  
! * Mon Mar 18 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.0-2jpp 
  - generic servlet support
  
! * Wed Feb 20 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.0-1jpp 
  - 2.3.0
  - no more compat jar
  
! * Sun Jan 27 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.2.0-2jpp 
  - adaptation to new stylebook1.0b3 package
  - used source tarball
--- 675,689 ----
  * Wed Jun 26 2002 Henri Gomez <hgomez at users.sourceforge.net> 2.3.1-2jpp
  - fix built classpath (bsf, bcel are existing jpackage rpms),
  - 2.3.1
  - vendor, distribution, group tags
  
! * Mon Mar 18 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.0-2jpp
  - generic servlet support
  
! * Wed Feb 20 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.0-1jpp
  - 2.3.0
  - no more compat jar
  
! * Sun Jan 27 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.2.0-2jpp
  - adaptation to new stylebook1.0b3 package
  - used source tarball

Index: xalan-j2-noxsltcdeps.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-noxsltcdeps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xalan-j2-noxsltcdeps.patch	3 Jun 2008 16:29:07 -0000	1.1
--- xalan-j2-noxsltcdeps.patch	18 Oct 2011 20:07:28 -0000	1.2
***************
*** 1,5 ****
! --- build.xml.orig	2004-02-27 20:45:31.000000000 +0100
! +++ build.xml	2004-03-21 15:46:37.000000000 +0100
! @@ -560,7 +560,7 @@
     <!-- =================================================================== -->
     <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) -->
--- 1,5 ----
! --- xalan-j_2_7_1/build.xml.orig	2011-06-07 16:36:56.822135727 -0400
! +++ xalan-j_2_7_1/build.xml	2011-06-07 16:43:08.496136950 -0400
! @@ -683,7 +683,7 @@
     <!-- =================================================================== -->
     <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) -->

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	29 Jul 2009 02:47:06 -0000	1.3
--- sources	18 Oct 2011 20:07:28 -0000	1.4
***************
*** 1 ****
! fc805051f0fe505c7a4b1b5c8db9b9e3  xalan-j_2_7_1-src.tar.gz
--- 1 ----
! 035fd09aa6ca43a297fd1238c54bebf3  xalan-j2-2.7.1.tar.bz2

--- NEW FILE: xalan-j2-stylesheets-xmlns-redirect.patch ---
--- xalan-j_2_7_1/xdocs/style/stylesheets/done.xsl.orig	2011-08-29 19:48:46.368194909 -0400
+++ xalan-j_2_7_1/xdocs/style/stylesheets/done.xsl	2011-08-29 19:49:24.071316377 -0400
@@ -6,7 +6,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    xmlns:redirect="http://xml.apache.org/xalan/redirect"
     extension-element-prefixes="redirect">
 
   <xsl:output method="xml"/>
--- xalan-j_2_7_1/xdocs/style/stylesheets/spec.xsl.orig	2011-08-29 19:48:46.372194605 -0400
+++ xalan-j_2_7_1/xdocs/style/stylesheets/spec.xsl	2011-08-29 19:49:24.071316377 -0400
@@ -26,7 +26,7 @@
 <!-- XSL Style sheet, DTD omitted -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:redirect="org.apache.xalan.lib.Redirect"
+                xmlns:redirect="http://xml.apache.org/xalan/redirect"
                 extension-element-prefixes="redirect">
   <xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN"/>
   

Index: xalan-j2-crosslink.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xalan-j2-crosslink.patch	3 Jun 2008 16:29:07 -0000	1.1
--- xalan-j2-crosslink.patch	18 Oct 2011 20:07:28 -0000	1.2
***************
*** 1,5 ****
! --- build.xml.orig	2007-02-12 13:43:06.000000000 +0100
! +++ build.xml	2007-02-12 13:46:08.000000000 +0100
! @@ -201,6 +201,8 @@
     <property name="build.serializer.jar"         value="${serializer.build.dir}/${serializer.jar.name}"/> 
     <property name="lib.serializer.jar"           value="./lib/${serializer.jar.name}"/>   
--- 1,5 ----
! --- xalan-j_2_7_1/build.xml.orig	2011-06-07 14:35:54.916385665 -0400
! +++ xalan-j_2_7_1/build.xml	2011-06-07 15:41:45.778385464 -0400
! @@ -194,6 +194,8 @@
     <property name="build.serializer.jar"         value="${serializer.build.dir}/${serializer.jar.name}"/> 
     <property name="lib.serializer.jar"           value="./lib/${serializer.jar.name}"/>   
***************
*** 10,14 ****
     <path id="docs.class.path">
       <pathelement location="${xmlapis.jar}" />
! @@ -1086,6 +1088,7 @@
             <group title="DOM 2" packages="org.w3c.dom*"/>
             <group title="XSLTC Core"
--- 10,14 ----
     <path id="docs.class.path">
       <pathelement location="${xmlapis.jar}" />
! @@ -1054,6 +1056,7 @@
             <group title="DOM 2" packages="org.w3c.dom*"/>
             <group title="XSLTC Core"
***************
*** 18,22 ****
     </target>
   
! @@ -1121,6 +1124,7 @@
             <group title="DOM 2" packages="org.w3c.dom*"/>
             <group title="XSLTC Core"
--- 18,22 ----
     </target>
   
! @@ -1089,6 +1092,7 @@
             <group title="DOM 2" packages="org.w3c.dom*"/>
             <group title="XSLTC Core"

--- NEW FILE: pom-xalan.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.apache</groupId>
    <artifactId>apache</artifactId>
    <version>4</version>
  </parent>

  <groupId>xalan</groupId>
  <artifactId>xalan</artifactId>
  <version>2.7.1.jbossorg-1</version>

  <name>Xalan Java</name>
  <description>
    Xalan-Java is an XSLT processor for transforming XML documents into HTML,
    text, or other XML document types. It implements XSL Transformations (XSLT)
    Version 1.0 and XML Path Language (XPath) Version 1.0 and can be used from
    the command line, in an applet or a servlet, or as a module in other program.
  </description>
  <url>http://xml.apache.org/xalan-j/</url>  

  <scm>
    <connection>scm:git:git at github.com:jboss/xalan-j.git</connection>
    <developerConnection>scm:git:git at github.com:jboss/xalan-j.git</developerConnection>
    <url>http://github.com/jboss/xalan-j</url>
  </scm>

  <developers>
    <developer>
      <id>jboss.org</id>
      <name>JBoss.org Community</name>
      <organization>JBoss.org</organization>
      <organizationUrl>http://www.jboss.org</organizationUrl>
    </developer>
  </developers>

  <dependencies>
    <dependency>
      <groupId>xalan</groupId>
      <artifactId>serializer</artifactId>
      <version>2.7.1-jbossorg-1</version>
    </dependency>
  </dependencies>

</project>
--- NEW FILE: xalan-j2-enable-xsltc.patch ---
--- xalan-j_2_7_1/src/META-INF/services/javax.xml.transform.TransformerFactory.orig	2011-06-07 15:48:08.155135179 -0400
+++ xalan-j_2_7_1/src/META-INF/services/javax.xml.transform.TransformerFactory	2011-06-07 15:52:00.291202424 -0400
@@ -1 +1 @@
-org.apache.xalan.processor.TransformerFactoryImpl
+org.apache.xalan.xsltc.trax.TransformerFactoryImpl

--- NEW FILE: xalan-j2-XALANJ-2535.patch ---
Index: xalan-j2/src/org/apache/xml/serializer/Encodings.java
===================================================================
--- xalan-j2/src/org/apache/xml/serializer/Encodings.java	(revision 1076291)
+++ xalan-j2/src/org/apache/xml/serializer/Encodings.java	(working copy)
@@ -317,7 +317,7 @@
             final InputStream is; 
                 
             SecuritySupport ss = SecuritySupport.getInstance();
-            is = ss.getResourceAsStream(ObjectFactory.findClassLoader(),
+            is = ss.getResourceAsStream(Encodings.class.getClassLoader(),
                                             ENCODINGS_FILE);
 
             Properties props = new Properties();
Index: xalan-j2/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java
===================================================================
--- xalan-j2/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java	(revision 1076291)
+++ xalan-j2/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java	(working copy)
@@ -25,6 +25,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.net.URL;
+import java.util.Enumeration;
 import java.util.Properties;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -116,18 +118,49 @@
      */
     private transient TransformerFactoryImpl _tfactory = null;
 
-    static final class TransletClassLoader extends ClassLoader {
-	TransletClassLoader(ClassLoader parent) {
-	    super(parent);
-	}
+	/**
+	 * A class loader that simulates a traditional parent-first model when ran
+	 * in modular class loading environments that do not intermix framework and
+	 * user provided classes. This approach is also compatible in a traditional
+	 * hierarchical environment.
+	 * 
+	 * This is necessary because Translets expect to see xsltc classes and user
+	 * classes on the same class loader. If in the future they are evolved to
+	 * separate user class loading from internal xsltc class references then
+	 * this class loader is no longer necessary.
+	 */
+	static final class TransletClassLoader extends ClassLoader {
+		private final static ClassLoader frameworkLoader = TransletClassLoader.class.getClassLoader();
+		private final ClassLoader ctx;
 
-        /**
-         * Access to final protected superclass member from outer class.
-         */
-	Class defineClass(final byte[] b) {
-            return defineClass(null, b, 0, b.length);
+		TransletClassLoader() {
+			super(TransletClassLoader.class.getClassLoader());
+			ClassLoader loader = SecuritySupport.getInstance().getContextClassLoader();
+			
+			// Don't bother delegating if the framework loader is the TCCL
+			ctx = frameworkLoader == loader ? null : loader;
+		}
+
+		protected Class<?> findClass(String name) throws ClassNotFoundException {
+			return ctx == null ? null : ctx.loadClass(name);
+		}
+
+		protected URL findResource(String name) {
+			return ctx == null ? null : ctx.getResource(name);
+		}
+
+		protected Enumeration<URL> findResources(String name)
+				throws IOException {
+			return ctx == null ? null : ctx.getResources(name);
+		}
+
+		/**
+		 * Access to final protected superclass member from outer class.
+		 */
+		Class defineClass(final byte[] b) {
+			return defineClass(null, b, 0, b.length);
+		}
 	}
-    }
 
 
     /**
@@ -283,7 +316,7 @@
         TransletClassLoader loader = (TransletClassLoader)
             AccessController.doPrivileged(new PrivilegedAction() {
                 public Object run() {
-                    return new TransletClassLoader(ObjectFactory.findClassLoader());
+                    return new TransletClassLoader();
                 }
             });
 



Index: xalan-j2-XALANJ-2321-AVT.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-XALANJ-2321-AVT.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xalan-j2-XALANJ-2321-AVT.patch	21 May 2009 18:24:44 -0000	1.1
--- xalan-j2-XALANJ-2321-AVT.patch	18 Oct 2011 20:07:28 -0000	1.2
***************
*** 1,7 ****
! Index: src/org/apache/xalan/templates/AVT.java
! ===================================================================
! --- src/org/apache/xalan/templates/AVT.java	(revision 442577)
! +++ src/org/apache/xalan/templates/AVT.java	(working copy)
! @@ -53,11 +53,6 @@
     private final static int INIT_BUFFER_CHUNK_BITS = 8; 
     
--- 1,7 ----
! Index: xalan-j2/src/org/apache/xalan/templates/AVT.java
! ===================================================================
! --- xalan-j2/src/org/apache/xalan/templates/AVT.java	(revision 442577)
! +++ xalan-j2/src/org/apache/xalan/templates/AVT.java	(working copy)
! @@ -53,11 +53,6 @@
     private final static int INIT_BUFFER_CHUNK_BITS = 8; 
     
***************
*** 15,19 ****
      * @serial
      */
! @@ -609,14 +604,9 @@
     
     private final FastStringBuffer getBuffer(){
--- 15,19 ----
      * @serial
      */
! @@ -609,14 +604,9 @@
     
     private final FastStringBuffer getBuffer(){

--- NEW FILE: xalan-j2-XALANJ-2382.patch ---
--- xalan-j2/src/org/apache/xalan/transformer/TransformerIdentityImpl.java.orig	2010-04-01 11:47:16.000000000 -0400
+++ xalan-j2/src/org/apache/xalan/transformer/TransformerIdentityImpl.java	2010-04-01 11:49:47.000000000 -0400
@@ -439,13 +439,11 @@
           } catch (SAXException se) {
             throw new TransformerException(se);
           }
-        } else {
-          try {
-            reader.setFeature("http://xml.org/sax/features/namespace-prefixes",
-                              true);
-          } catch (org.xml.sax.SAXException se) {
-            // We don't care.
-          }
+        }
+        try {
+          reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+        } catch (org.xml.sax.SAXException se) {
+          // We don't care.
         }
 
         // Get the input content handler, which will handle the 

--- NEW FILE: pom-serializer.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>org.apache</groupId>
    <artifactId>apache</artifactId>
    <version>4</version>
  </parent>

  <groupId>xalan</groupId>
  <artifactId>serializer</artifactId>
  <version>2.7.1.jbossorg-1</version>

  <name>Xalan Java Serializer</name>
  <description>
    Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input
    SAX events.
  </description>
  <url>http://xml.apache.org/xalan-j/</url>  

  <scm>
    <connection>scm:git:git at github.com:jboss/xalan-j.git</connection>
    <developerConnection>scm:git:git at github.com:jboss/xalan-j.git</developerConnection>
    <url>http://github.com/jboss/xalan-j</url>
  </scm>

  <developers>
    <developer>
      <id>jboss.org</id>
      <name>JBoss.org Community</name>
      <organization>JBoss.org</organization>
      <organizationUrl>http://www.jboss.org</organizationUrl>
    </developer>
  </developers>

</project>



More information about the JPackage-commits mailing list