rpms/dom4j/devel dom4j-1.6.1-build_xml.patch, NONE, 1.1 dom4j-gjdoc.patch, NONE, 1.1 dom4j.spec, NONE, 1.1 dom4j_rundemo.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Nuno Santos (nsantos)
fedora-extras-commits at redhat.com
Mon Mar 19 21:41:20 UTC 2007
Author: nsantos
Update of /cvs/extras/rpms/dom4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10457/devel
Modified Files:
.cvsignore sources
Added Files:
dom4j-1.6.1-build_xml.patch dom4j-gjdoc.patch dom4j.spec
dom4j_rundemo.sh
Log Message:
auto-import dom4j-1.6.1-2jpp.1.fc7 on branch devel from dom4j-1.6.1-2jpp.1.fc7.src.rpm
dom4j-1.6.1-build_xml.patch:
--- NEW FILE dom4j-1.6.1-build_xml.patch ---
--- build.xml.sav 2007-02-16 01:51:43.000000000 -0500
+++ build.xml 2007-02-16 02:07:51.000000000 -0500
@@ -9,6 +9,11 @@
</fileset>
</path>
+ <path id="boot.compile.classpath">
+ <pathelement location="/usr/share/java/jaxp12.jar"/>
+ <pathelement location="/usr/lib/jvm/java/jre/lib/rt.jar"/>
+ </path>
+
<path id="endorsed.classpath">
<fileset dir="./lib/endorsed">
<include name="*.jar" />
@@ -145,7 +150,8 @@
target="1.3"
source="1.3"
deprecation="${deprecation}"
- classpathref="compile.classpath">
+ classpathref="compile.classpath"
+ bootclasspathref="boot.compile.classpath">
</javac>
</target>
@@ -191,6 +197,7 @@
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
destdir="${build.javadocs}"
+ classpathref="compile.classpath"
author="true"
version="true"
use="true"
@@ -210,6 +217,7 @@
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
destdir="${build.javadocs}"
+ classpathref="compile.classpath"
author="true"
version="true"
use="true"
@@ -227,6 +235,7 @@
<javadoc packagenames="${api.packages}"
sourcepath="${build.src}"
destdir="${build.apidocs}"
+ classpathref="compile.classpath"
author="true"
version="true"
use="true"
@@ -335,10 +344,10 @@
<target name="prepare-jaxb" depends="prepare-samples">
<path id="classpath.jaxb">
- <pathelement location="./lib/tools/jaxme-0.3.jar"/>
- <pathelement location="./lib/tools/jaxme-js-0.3.jar"/>
- <pathelement location="./lib/tools/jaxme-xs-0.3.jar"/>
- <pathelement location="./lib/jaxme-api-0.3.jar"/>
+ <pathelement location="./lib/tools/jaxme2.jar"/>
+ <pathelement location="./lib/tools/jaxmejs.jar"/>
+ <pathelement location="./lib/tools/jaxmexs.jar"/>
+ <pathelement location="./lib/jaxmeapi.jar"/>
</path>
<taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask">
dom4j-gjdoc.patch:
--- NEW FILE dom4j-gjdoc.patch ---
--- build.xml 2005-05-16 09:28:41.000000000 -0400
+++ build.xml 2007-02-16 14:13:59.000000000 -0500
@@ -198,7 +205,7 @@
noindex="false"
windowtitle="${Name} Full JavaDoc"
doctitle="${Name}"
- bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+ bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <a href='http://sourceforge.net'>SourceForge</a>"
stylesheetfile="${doc.dir}/style/javadoc.css">
</javadoc>
</target>
--- NEW FILE dom4j.spec ---
Summary: Open Source XML framework for Java
Name: dom4j
Version: 1.6.1
Release: 2jpp.1%{?dist}
Epoch: 0
License: BSD
URL: http://www.dom4j.org/
Group: Development/Libraries
Source0: http://downloads.sourceforge.net/dom4j/dom4j-1.6.1.tar.gz
Source1: dom4j_rundemo.sh
Patch0: dom4j-1.6.1-build_xml.patch
Patch1: dom4j-gjdoc.patch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
BuildRequires: junit
BuildRequires: jtidy
BuildRequires: junitperf
BuildRequires: isorelax
BuildRequires: jaxen-bootstrap >= 0:1.1-0.b7
BuildRequires: msv-msv
BuildRequires: relaxngDatatype
BuildRequires: bea-stax
BuildRequires: bea-stax-api
BuildRequires: ws-jaxme
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: jaxp = 1.2
BuildRequires: xpp2
BuildRequires: xpp3
BuildRequires: msv-xsdlib
# package needs this specific version of jaxp
# newer jaxp versions will not work
BuildRequires: jaxp = 1.2
Requires: xpp2
Requires: xpp3
Requires: xerces-j2
Requires: msv-msv
Requires: msv-xsdlib
Requires: relaxngDatatype
Requires: isorelax
Requires: jaxen-bootstrap >= 0:1.1-0.b7
Requires: jpackage-utils >= 0:1.6
Requires: bea-stax
Requires: bea-stax-api
Requires: ws-jaxme
Requires: xalan-j2
Requires: jaxp = 1.2
# package needs this specific version of jaxp.
# newer jaxp versions will not work
Requires: jaxp = 1.2
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
dom4j is an Open Source XML framework for Java. dom4j allows you to read,
write, navigate, create and modify XML documents. dom4j integrates with
DOM and SAX and is seamlessly integrated with full XPath support.
%package demo
Summary: Samples for %{name}
Group: Documentation
Requires: dom4j = 0:%{version}-%{release}
%description demo
Samples for %{name}.
%package manual
Summary: Manual for %{name}
Group: Documentation
%description manual
Documentation for %{name}.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{name}-%{version}
# replace run.sh
cp -p %{SOURCE1} run.sh
# remove binary libs
find . -name "*.jar" -exec rm -f {} \;
#for j in $(find . -name "*.jar"); do
# mv $j $j.no
#done
# won't succeed in headless environment
rm src/test/org/dom4j/bean/BeansTest.java
# fix for deleted jars
mv build.xml build.xml.orig
sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
%patch0 -b .sav
%patch1 -b .sav1
%build
pushd lib
ln -sf $(build-classpath xpp2)
ln -sf $(build-classpath relaxngDatatype)
pushd endorsed
ln -sf $(build-classpath xml-commons-jaxp-1.2-apis)
popd
ln -sf $(build-classpath jaxme/jaxmeapi)
ln -sf $(build-classpath msv-xsdlib)
ln -sf $(build-classpath msv-msv)
ln -sf $(build-classpath jaxen)
ln -sf $(build-classpath bea-stax-api)
pushd test
ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath junitperf)
ln -sf $(build-classpath junit)
popd
ln -sf $(build-classpath xpp3)
pushd tools
ln -sf $(build-classpath jaxme/jaxmexs)
ln -sf $(build-classpath xalan-j2)
ln -sf $(build-classpath jaxme/jaxmejs)
ln -sf $(build-classpath jtidy)
ln -sf $(build-classpath isorelax)
ln -sf $(build-classpath jaxme/jaxme2)
ln -sf $(build-classpath xerces-j2)
popd
popd
# FIXME: test needs to be fixed
ant all samples # test
%install
rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/%{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
pushd build/doc/javadoc
for f in `find -name \*.html -o -name \*.css`; do
sed -i 's/\r//g' $f;
done
popd
cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
rm -rf docs/apidocs docs/clover
pushd docs
for f in `find -name \*.html -o -name \*.css -o -name \*.java`; do
sed -i 's/\r//g' $f;
done
popd
cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
tr -d \\r <LICENSE.txt >tmp.file; mv tmp.file LICENSE.txt
cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/classes/org/dom4j
cp -pr xml $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/src
cp -pr src/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/src
cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/classes/org/dom4j
install -m 755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/*
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}
%files demo
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_datadir}/%{name}-%{version}/run.sh
%{_datadir}/%{name}-%{version}
%changelog
* Wed Feb 14 2007 Jeff Johnston <jjohnstn at redhat.com> - 0:1.6.1-2jpp.1
- Resolves: #227049
- Updated per Fedora package review process
- Modified dom4j-1.6.1-build_xml.patch to include jaxp 1.2 apis on
boot classpath
- Added new patch for javadocs
- Add buildrequires for jaxp = 1.2
* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-2jpp
- Change STAX dependency to free bea-stax and bea-stax-api
* Wed Aug 17 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-1jpp
- Upgrade to 1.6.1
- Now requires xpp3 additionally to xpp2
* Thu Sep 09 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.5-1jpp
- Upgrade to 1.5
- Drop saxpath requirement as this is now included in jaxen
* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-3jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
* Tue Jul 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-2jpp
- Replace non-free msv with free relaxngDatatype xsdlib isorelax msv-strict
- Relax some versioned dependencies
* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
- First JPackage release
--- NEW FILE dom4j_rundemo.sh ---
#!/bin/sh
XMLFMTOPS="-indentSize 2 -trimText -newlines"
if [ $# -eq 0 ]; then
echo PullParserDemo
echo ./run.sh samples.PullParserDemo $XMLFMTOPS xml/web.xml
echo ./run.sh samples.PullParserDemo $XMLFMTOPS xml/fibo.xml
echo
echo SAXDemo
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/web.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/test/test_schema.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/xhtml/xhtml-basic.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/contents.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/cdata.xml
echo ./run.sh -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser samples.SAXDemo $XMLFMTOPS xml/cdata.xml
echo ./run.sh -Dorg.xml.sax.driver=xml.aelfred2.SAXDriver samples.SAXDemo $XMLFMTOPS xml/cdata.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/testPI.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/namespaces.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/testNamespaces.xml
echo ./run.sh samples.SAXDemo $XMLFMTOPS xml/inline.xml
echo
echo DOMDemo
echo ./run.sh samples.dom.DOMDemo xml/contents.xml
echo
echo SAXDOMDemo
echo ./run.sh samples.dom.SAXDOMDemo xml/contents.xml
echo
echo JTidyDemo
echo ./run.sh samples.JTidyDemo $XMLFMTOPS readme.html
echo
echo VisitorDemo
echo ./run.sh samples.VisitorDemo xml/cdata.xml
echo
echo CountDemo
echo ./run.sh samples.CountDemo xml/fibo.xml
echo
echo CreateXMLDemo
echo ./run.sh samples.CreateXMLDemo
echo
echo HTMLWriterDemo
echo ./run.sh samples.HTMLWriterDemo xml/xhtml.xml
echo
echo PerformanceTest
echo ./run.sh -Xprof samples.performance.PerformanceSupport xml/periodic_table.xml org.dom4j.DocumentFactory 10
echo ./run.sh -Xprof -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser samples.performance.PerformanceSupport xml/periodic_table.xml org.dom4j.DocumentFactory 10
echo ./run.sh -Xprof -Dorg.xml.sax.driver=xml.aelfred2.SAXDriver samples.performance.PerformanceSupport xml/periodic_table.xml org.dom4j.DocumentFactory 10
echo ./run.sh -Xprof samples.performance.PerformanceSupport xml/much_ado.xml org.dom4j.DocumentFactory 10
echo ./run.sh -Xprof -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser samples.performance.PerformanceSupport xml/much_ado.xml org.dom4j.DocumentFactory 10
echo ./run.sh -Xprof -Dorg.xml.sax.driver=xml.aelfred2.SAXDriver samples.performance.PerformanceSupport xml/much_ado.xml org.dom4j.DocumentFactory 10
echo
echo XPathDemo
echo ./run.sh samples.XPathDemo xml/web.xml //servlet/servlet-class
echo ./run.sh samples.XPathDemo xml/much_ado.xml //ACT/TITLE
echo
echo XSLTDemo
echo ./run.sh samples.XSLTDemo xml/nitf/sample.xml xml/nitf/ashtml.xsl
echo
echo XSLTNativeDOMDemo
echo ./run.sh samples.dom.XSLTNativeDOMDemo xml/nitf/sample.xml xml/nitf/ashtml.xsl
echo
echo LargeDocumentDemo
echo ./run.sh samples.LargeDocumentDemo xml/much_ado.xml /PLAY/ACT
echo
echo LargeDocumentDemo2
echo ./run.sh samples.LargeDocumentDemo2 xml/much_ado.xml
echo
echo LinkCheckerDemo
echo ./run.sh samples.LinkChecker xml/xhtml/xhtml-basic.xml
echo
echo BeanDemo
echo ./run.sh samples.bean.BeanDemo xml/bean/gui.xml
echo
echo SAXValidatorDemo
echo ./run.sh samples.validate.SAXValidatorDemo xml/nitf/invalid.xml
echo
echo VisitorDemo
echo ./run.sh -Dorg.dom4j.factory=org.dom4j.datatype.DatatypeDocumentFactory samples.VisitorDemo xml/schema/personal-schema.xml
echo
echo JTableDemo
echo ./run.sh samples.swing.JTableDemo xml/web.xml
echo
echo JTableTool
echo ./run.sh samples.swing.JTableTool xml/swing/tableForAtoms.xml xml/periodic_table.xml
echo
echo JTreeDemo
echo ./run.sh samples.swing.JTreeDemo xml/web.xml
exit 0
fi
if [ -z "$JAVA_HOME" ] ; then
JAVA=`which java`
if [ -z "$JAVA" ] ; then
echo "Cannot find JAVA. Please set your PATH."
exit 1
fi
JAVA_BIN=`dirname $JAVA`
JAVA_HOME=$JAVA_BIN/..
fi
JAVA=$JAVA_HOME/bin/java
CLASSPATH=`build-classpath \
dom4j \
xpp2 \
jtidy \
fop \
xerces-j2 \
msv-relaxngDatatype \
msv-xsdlib \
msv-isorelax \
msv \
jaxen \
junit \
junitperf \
saxpath \
xalan-j2 \
xml-commons-apis \
avalon-framework \
avalon-logkit \
`:$CLASSPATH
BOOTCLASSPATH=`build-classpath \
xml-commons-apis \
xerces-j2 \
xalan-j2 \
`
CLASSPATH=classes:$CLASSPATH:$JAVA_HOME/lib/tools.jar
$JAVA -Xbootclasspath/p:$BOOTCLASSPATH -classpath $CLASSPATH "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dom4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Mar 2007 19:14:04 -0000 1.1
+++ .cvsignore 19 Mar 2007 21:40:47 -0000 1.2
@@ -0,0 +1 @@
+dom4j-1.6.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dom4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Mar 2007 19:14:04 -0000 1.1
+++ sources 19 Mar 2007 21:40:47 -0000 1.2
@@ -0,0 +1 @@
+1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz
More information about the fedora-extras-commits
mailing list