rpm/adaptx
SHA256
1
0
Fork 0
forked from pool/adaptx
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/adaptx?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2008-04-25 12:50:10 +00:00 committed by Git OBS Bridge
parent b5ec918fdb
commit e773b88a1b
6 changed files with 366 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
adaptx-0.9.13-icedtea-build.patch Normal file
View File

@ -0,0 +1,155 @@
--- src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java
+++ src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java
@@ -424,9 +424,9 @@
}
else {
_outputProperties = new Properties();
- Enumeration enum = properties.keys();
- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ Enumeration enum2 = properties.keys();
+ while (enum2.hasMoreElements()) {
+ String name = (String)enum2.nextElement();
String value = properties.getProperty(name);
_outputProperties.setProperty(name, value);
}
--- src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java
+++ src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java
@@ -513,6 +513,9 @@
} //-- newXMLFilter
+ //JDK5 build
+ public void setFeature(String name, boolean value)
+ throws javax.xml.transform.TransformerConfigurationException {}
} //-- TransformerFactoryImpl
--- src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java
+++ src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java
@@ -454,9 +454,9 @@
else {
_outputProperties = new Properties();
XSLOutput output = new XSLOutput();
- Enumeration enum = properties.keys();
- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ Enumeration enum2 = properties.keys();
+ while (enum2.hasMoreElements()) {
+ String name = (String)enum2.nextElement();
String value = properties.getProperty(name);
_outputProperties.setProperty(name, value);
try {
--- src/main/org/exolab/adaptx/xslt/RuleProcessor.java
+++ src/main/org/exolab/adaptx/xslt/RuleProcessor.java
@@ -262,7 +262,7 @@
ResultFormatter rf = ps.getResultFormatter();
- Enumeration enum = null;
+ Enumeration enum2 = null;
//-- copy top-level declared namespaces
/*
Hashtable namespaces = stylesheet.getNamespaces();
@@ -304,9 +304,9 @@
// Process top-level parameters
ScopedVariableSet vars = ps.getVariables();
- enum = stylesheet.getParameters();
- while (enum.hasMoreElements()) {
- Param param = (Param)enum.nextElement();
+ enum2 = stylesheet.getParameters();
+ while (enum2.hasMoreElements()) {
+ Param param = (Param)enum2.nextElement();
//-- first check passed in parameters
String value = getParameter(param.getName());
if (value != null) {
@@ -322,9 +322,9 @@
}
//-- Process top-level variables
- enum = stylesheet.getVariables();
- while (enum.hasMoreElements()) {
- Variable variable = (Variable)enum.nextElement();
+ enum2 = stylesheet.getVariables();
+ while (enum2.hasMoreElements()) {
+ Variable variable = (Variable)enum2.nextElement();
XPathResult value = processVariable(variable, ps);
if (value != null) {
vars.setVariable(variable.getName(), value);
--- src/main/org/exolab/adaptx/xslt/XSLTProcessor.java
+++ src/main/org/exolab/adaptx/xslt/XSLTProcessor.java
@@ -1266,9 +1266,9 @@
* @param ruleProcessor the RuleProcessor to copy parameters to
**/
private void copyParams(RuleProcessor ruleProcessor) {
- Enumeration enum = params.keys();
- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ Enumeration enum2 = params.keys();
+ while (enum2.hasMoreElements()) {
+ String name = (String)enum2.nextElement();
ruleProcessor.setParameter(name, params.getProperty(name));
}
} //-- copyParams
@@ -1635,4 +1635,4 @@
} //-- readXSLStylesheet
-} //-- XSLProcessor
\ No newline at end of file
+} //-- XSLProcessor
--- src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java
+++ src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java
@@ -569,10 +569,10 @@
if (namespace == null) return null;
String qns = (String) quotedns.get(namespace);
if (qns != null) {
- Enumeration enum = namespaces.keys();
+ Enumeration enum2 = namespaces.keys();
String key;
- while (enum.hasMoreElements()) {
- key = (String)enum.nextElement();
+ while (enum2.hasMoreElements()) {
+ key = (String)enum2.nextElement();
if (qns.equals(namespaces.get(key)))
return key;
}
@@ -1094,16 +1094,16 @@
// combine global variables and parameters
try {
- Enumeration enum = xsl.getVariables();
- while (enum.hasMoreElements()) {
- Variable v = (Variable) enum.nextElement();
+ Enumeration enum2 = xsl.getVariables();
+ while (enum2.hasMoreElements()) {
+ Variable v = (Variable) enum2.nextElement();
Variable tmp = getVariable(v.getName());
if (tmp != null) variables.remove(tmp);
addVariable(v, true);
}
- enum = xsl.getParameters();
- while (enum.hasMoreElements()) {
- Param p = (Param) enum.nextElement();
+ enum2 = xsl.getParameters();
+ while (enum2.hasMoreElements()) {
+ Param p = (Param) enum2.nextElement();
Param tmp = getParameter(p.getName());
if (tmp != null) parameters.remove(tmp);
addParam(p);
--- src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java
+++ src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java
@@ -200,9 +200,9 @@
_handler.endElement(uri, name, name);
}
- Enumeration enum = _namespaces.getLocalNamespacePrefixes();
- while (enum.hasMoreElements()) {
- _handler.endPrefixMapping((String)enum.nextElement());
+ Enumeration enum2 = _namespaces.getLocalNamespacePrefixes();
+ while (enum2.hasMoreElements()) {
+ _handler.endPrefixMapping((String)enum2.nextElement());
}
_namespaces = _namespaces.getParent();

3
adaptx-0.9.13-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:522bdc45313da5d859feb1489fc9ab8324d6463cfa9cf4f220697d7cd82b06f6
size 2504164

34
adaptx-0.9.6-xsl.patch → adaptx-0.9.13-xsl.patch
View File

@ -1,5 +1,5 @@
--- src/doc/style/exolab.xsl.orig Thu Aug 19 11:58:23 2004
+++ src/doc/style/exolab.xsl Thu Aug 19 11:58:47 2004
--- src/doc/style/exolab.xsl.sav 2006-06-19 18:25:07.000000000 +0200
+++ src/doc/style/exolab.xsl 2006-06-19 18:28:57.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
@ -7,8 +7,8 @@
<xsl:output method="html" indent="no"/>
--- src/doc/style/keywords.xsl.orig Thu Aug 19 11:58:23 2004
+++ src/doc/style/keywords.xsl Thu Aug 19 11:58:55 2004
--- src/doc/style/keywords.xsl.sav 2006-06-19 18:30:23.000000000 +0200
+++ src/doc/style/keywords.xsl 2006-06-19 18:30:38.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
@ -16,8 +16,8 @@
<xsl:template match="keywords">
<xsl:element name="meta">
<xsl:attribute name="http-equiv">Keywords</xsl:attribute>
--- src/doc/style/leftNav.xsl.orig Thu Aug 19 11:58:23 2004
+++ src/doc/style/leftNav.xsl Thu Aug 19 11:59:00 2004
--- src/doc/style/leftNav.xsl.sav 2006-06-19 18:31:37.000000000 +0200
+++ src/doc/style/leftNav.xsl 2006-06-19 18:31:51.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
@ -25,17 +25,8 @@
<xsl:template match="$project/navSections">
<xsl:for-each select="section">
--- src/doc/style/searchForm.xsl.orig Thu Aug 19 11:58:23 2004
+++ src/doc/style/searchForm.xsl Thu Aug 19 11:59:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template match="searchForm">
<table width="95" border="0" cellpadding="0" cellspacing="0">
--- src/doc/style/topNav.xsl.orig Thu Aug 19 11:58:23 2004
+++ src/doc/style/topNav.xsl Thu Aug 19 11:59:12 2004
--- src/doc/style/topNav.xsl.sav 2006-06-19 18:33:16.000000000 +0200
+++ src/doc/style/topNav.xsl 2006-06-19 18:33:32.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
@ -43,3 +34,12 @@
<xsl:variable name="leftTopNavPos" select="5"/>
<xsl:template match="$project/topNav">
--- src/doc/style/searchForm.xsl.sav 2006-06-19 18:32:38.000000000 +0200
+++ src/doc/style/searchForm.xsl 2006-06-19 18:32:53.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template match="searchForm">
<table width="95" border="0" cellpadding="0" cellspacing="0">

3
adaptx-0.9.6-cvs.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:851d08e1c7601602db34c478deaa62846b55ff78c614e41d631a0dc19e7bf972
size 2035802

60
adaptx.changes
View File

@ -1,3 +1,63 @@
-------------------------------------------------------------------
Thu Feb 28 12:43:31 CET 2008 - mvyskocil@suse.cz
- Adopted from jpackage(1.7)
- New version 0.9.13
- Fixed bug where normalize-space() function required an argument.
With no arguments, it now correctly defaults to the context node.
(kvisco - 20050114)
- Backed out previous fix in 0.9.12. It was an incorrect fix,
there was actually no bug with the node-set comparisons
after triple-checking the XPath spec. When comparing two nodesets
sometimes they can both be equal and not-equal at the same time,
and sometimes they can both be never and equal, and never not-equal.
It's very confusing, but the previous implementation had it correct.
- Fixed bug in EqualyExprImpl with respect to the NOT_EQUALS
operator (!=) when used with NodeSet comparisons.
- Fixed issue with xsl:sort that was restricting the result of
the expression specified by the select attribute to be a
node-set, instead of any valid XPath result.
- Fixed some NullPointerExceptions that were occurring when
attempting to create a StringResult with a null value.
- Fixed issue of possible incorrect context node
when processing certain expressions at the top-level.
- Fixed parse error when using variables in union expressions.
- Fixed issue with using the node-test keywords in
attribute expressions (eg: @text, @node, @pi)
- Added some improvements to the expressions API to
allow greater ability to "drill-down" and get to
the core components of the XPath expressions.
- Fixes issue with error occuring when "xml prefix" is being
declared by Xerces. Normally, the "xml" prefix shouldn't
be declared, but Xerces declares this, probably as a
convenience. The error is changed to check only for
a redefinition of the "xml" prefix to a non-valid
URI.
- Made some improvements to the XPath expressions package to
allow improved accessibility to the components of a given
expression. Improvements include the ability to obtain the
Operator type of a BinaryExpr and a new GroupedExpression
interface for expressions wrapped in parenthesis.
(kvisco - 2003-10-06)
- Added Identity transformation support in the JAXP implementation
(kvisco - 2003-10-06)
- Fixed *static* variable bug in the Lexer, should fix some problems
with certain operators being treated as a function name. This was
a regression from 0.9.5 (I think).
(kvisco - 2003-10-02)
- Added support for URIResolver in the JAXP implementation
(kvisco - 2003-10-01)
- Fixed document-base bug with document() function
(kvisco - 2003-09-28)
- Updated to support JAXP. The user must first configure
their environment by setting within the system properties
the JAXP property: javax.xml.transform.TransformerFactory
to the value of:
org.exolab.adaptx.jaxp.transform.TransformerFactoryImpl
(kvisco - 2003-09-09)
- Compiled by icedtea
-------------------------------------------------------------------
Fri Sep 15 14:47:24 CEST 2006 - ro@suse.de

167
adaptx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package adaptx (Version 0.9.6)
# spec file for package adaptx (Version 0.9.13)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,25 +10,42 @@
# norootforbuild
Name: adaptx
BuildRequires: ant java2-devel-packages xml-commons-apis
%{!?_with_external: %{!?_without_external: %define _without_external 1}}
%define name adaptx
%define version 0.9.6
%define release 2jpp
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define section free
Version: 0.9.6
Release: 24
Name: adaptx
Version: 0.9.13
Release: 1
Summary: XSLT Processor Written in Java
License: BSD, Other License(s), see package
License: BSD 3-Clause
Group: Development/Libraries/Java
Source0: %{name}-%{version}-cvs.tar.bz2
Source0: %{name}-%{version}-src.tar.bz2
# svn export http://svn.codehaus.org/castor/adaptx
Patch0: %{name}-%{version}-xsl.patch
URL: http://castor.exolab.org/
%if %{?_with_external:1}%{!?_with_external:0}
Patch1: %{name}-%{version}-icedtea-build.patch
Url: http://castor.exolab.org/
BuildRequires: ant >= 1.6
BuildRequires: jpackage-utils >= 1.6
BuildRequires: log4j
BuildRequires: xml-commons-apis
BuildRequires: xerces-j2
%if %defined suse_version
BuildRequires: java-devel
%endif
Requires: ant >= 1.6
Requires: jpackage-utils >= 1.6
Requires: log4j
Requires: xml-commons-apis
Requires: xerces-j2
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
AdaptX is an extensible stylesheet language (XSL) processor.
@ -36,9 +53,12 @@ AdaptX is an extensible stylesheet language (XSL) processor.
%package javadoc
License: BSD 3-Clause
PreReq: coreutils
Group: Development/Libraries/Java
Summary: Javadoc for adaptx
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%description javadoc
This package contains the javadoc documentation for AdaptX.
@ -46,6 +66,7 @@ This package contains the javadoc documentation for AdaptX.
%package doc
License: BSD 3-Clause
Summary: Documentation for adaptx
Group: Development/Libraries/Java
@ -55,27 +76,23 @@ This package contains the documentation for AdaptX.
%prep
%setup -q -n %{name}
%setup -q -n %{name}-%{version}-src
# remove CVS internal files
for dir in `find . -type d -name CVS`; do rm -rf $dir; done
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
%patch0
%patch1
%build
perl -p -i -e 's|classic|modern|' src/build.xml
if ! grep -q "javac.*source=" src/build.xml ; then
perl -p -i -e 's|<javac |<javac source=\"1.4\" |' src/build.xml
perl -p -i -e 's|<javadoc |<javadoc source=\"1.4\" |' src/build.xml
fi
%if %{?_with_external:1}%{!?_with_external:0}
export CLASSPATH=$(build-classpath adaptx xml-commons-apis)
%else
export CLASSPATH=dist/adaptx_%{version}.jar:$(build-classpath xml-commons-apis)
%endif
ant -buildfile src/build.xml jar
ant -buildfile src/build.xml javadoc
ant -buildfile src/build.xml doc
#export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis)
export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2)
ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml jar javadoc
CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml doc
%install
# jar
@ -86,6 +103,9 @@ install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -rf build/doc/javadoc
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -98,11 +118,30 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(0664,root,root,0755)
%doc src/etc/{CHANGELOG,contributors.html,LICENSE}
%{_javadir}/*
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
%files javadoc
%defattr(0664,root,root,0755)
@ -112,16 +151,72 @@ fi
%defattr(0664,root,root,0755)
%doc build/doc/*
%changelog -n adaptx
* Fri Sep 15 2006 - ro@suse.de
%changelog
* Thu Feb 28 2008 mvyskocil@suse.cz
- Adopted from jpackage(1.7)
- New version 0.9.13
- Fixed bug where normalize-space() function required an argument.
With no arguments, it now correctly defaults to the context node.
(kvisco - 20050114)
- Backed out previous fix in 0.9.12. It was an incorrect fix,
there was actually no bug with the node-set comparisons
after triple-checking the XPath spec. When comparing two nodesets
sometimes they can both be equal and not-equal at the same time,
and sometimes they can both be never and equal, and never not-equal.
It's very confusing, but the previous implementation had it correct.
- Fixed bug in EqualyExprImpl with respect to the NOT_EQUALS
operator (!=) when used with NodeSet comparisons.
- Fixed issue with xsl:sort that was restricting the result of
the expression specified by the select attribute to be a
node-set, instead of any valid XPath result.
- Fixed some NullPointerExceptions that were occurring when
attempting to create a StringResult with a null value.
- Fixed issue of possible incorrect context node
when processing certain expressions at the top-level.
- Fixed parse error when using variables in union expressions.
- Fixed issue with using the node-test keywords in
attribute expressions (eg: @text, @node, @pi)
- Added some improvements to the expressions API to
allow greater ability to "drill-down" and get to
the core components of the XPath expressions.
- Fixes issue with error occuring when "xml prefix" is being
declared by Xerces. Normally, the "xml" prefix shouldn't
be declared, but Xerces declares this, probably as a
convenience. The error is changed to check only for
a redefinition of the "xml" prefix to a non-valid
URI.
- Made some improvements to the XPath expressions package to
allow improved accessibility to the components of a given
expression. Improvements include the ability to obtain the
Operator type of a BinaryExpr and a new GroupedExpression
interface for expressions wrapped in parenthesis.
(kvisco - 2003-10-06)
- Added Identity transformation support in the JAXP implementation
(kvisco - 2003-10-06)
- Fixed *static* variable bug in the Lexer, should fix some problems
with certain operators being treated as a function name. This was
a regression from 0.9.5 (I think).
(kvisco - 2003-10-02)
- Added support for URIResolver in the JAXP implementation
(kvisco - 2003-10-01)
- Fixed document-base bug with document() function
(kvisco - 2003-09-28)
- Updated to support JAXP. The user must first configure
their environment by setting within the system properties
the JAXP property: javax.xml.transform.TransformerFactory
to the value of:
org.exolab.adaptx.jaxp.transform.TransformerFactoryImpl
(kvisco - 2003-09-09)
- Compiled by icedtea
* Fri Sep 15 2006 ro@suse.de
- set source=1.4 for java
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jul 27 2005 - jsmeix@suse.de
* Wed Jul 27 2005 jsmeix@suse.de
- Adjustments in the spec file.
* Mon Jul 18 2005 - jsmeix@suse.de
* Mon Jul 18 2005 jsmeix@suse.de
- Current version 0.9.6 from JPackage.org
* Thu Sep 16 2004 - skh@suse.de
* Thu Sep 16 2004 skh@suse.de
- Fix prerequires of javadoc subpackage
* Sun Sep 05 2004 - skh@suse.de
* Sun Sep 05 2004 skh@suse.de
- Initial package created with version 0.9.6 (JPackage 1.5)