From 091cbf261c5405e74ca1c1990b814908a84f61be Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:36:13 +0000 Subject: [PATCH 01/10] Initialize branch F-11 for xdoclet --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From f992df0b8efde4efeb2e6611d387e80aed33e0cd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:44:23 +0000 Subject: [PATCH 02/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xdoclet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdoclet.spec b/xdoclet.spec index abd690e..e3f0a65 100644 --- a/xdoclet.spec +++ b/xdoclet.spec @@ -47,7 +47,7 @@ Name: xdoclet Version: 1.2.3 -Release: 10.4%{?dist} +Release: 11.4%{?dist} Epoch: 0 Summary: XDoclet Attribute Orientated Programming Framework License: BSD @@ -322,6 +322,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.2.3-11.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0:1.2.3-10.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 59228e368ae0bf69ca420f28819ed6ff06aea5f6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:55 +0000 Subject: [PATCH 03/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7086529..0fe191b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xdoclet -# $Id: Makefile,v 1.1 2004/10/14 18:43:33 fnasser Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:39 notting Exp $ NAME := xdoclet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5fa62cd8c49268924172d971a77de99eb8bdd09f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:16 +0000 Subject: [PATCH 04/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7086529..0fe191b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xdoclet -# $Id: Makefile,v 1.1 2004/10/14 18:43:33 fnasser Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:39 notting Exp $ NAME := xdoclet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bfc1e7b8c0691fc9ae823bfda267c9c1f60d942f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:37:57 +0000 Subject: [PATCH 05/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0fe191b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xdoclet -# $Id: Makefile,v 1.2 2007/10/15 19:31:39 notting Exp $ -NAME := xdoclet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 52d14285fa7d066ff87c609298f68eb9fd0a9f99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:01 +0000 Subject: [PATCH 06/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0fe191b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xdoclet -# $Id: Makefile,v 1.2 2007/10/15 19:31:39 notting Exp $ -NAME := xdoclet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From 78f735b145b1f1d09c4edbcb37e0efb4c07cf69f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:56:24 -0600 Subject: [PATCH 07/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xdoclet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdoclet.spec b/xdoclet.spec index e3f0a65..add89b2 100644 --- a/xdoclet.spec +++ b/xdoclet.spec @@ -47,7 +47,7 @@ Name: xdoclet Version: 1.2.3 -Release: 11.4%{?dist} +Release: 12.4%{?dist} Epoch: 0 Summary: XDoclet Attribute Orientated Programming Framework License: BSD @@ -322,6 +322,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2.3-12.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.2.3-11.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 16eef0eab9956ee079f23469bb842e6cf87c13b2 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 29 Nov 2011 10:55:36 +0200 Subject: [PATCH 08/10] Remove parts that are irrelevant to Fedora. Adapt to current guidelines. Drop demo - depending on struts which is no longer in the distro. --- xdoclet.spec | 205 ++++----------------------------------------------- 1 file changed, 14 insertions(+), 191 deletions(-) diff --git a/xdoclet.spec b/xdoclet.spec index add89b2..c3c01c5 100644 --- a/xdoclet.spec +++ b/xdoclet.spec @@ -28,26 +28,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define _with_gcj_support 1 -%define _without_maven 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - -# If you don't want to build with maven, and use straight ant instead, -# give rpmbuild option '--without maven' -%define with_maven %{!?_without_maven:1}%{?_without_maven:0} -%define without_maven %{?_without_maven:1}%{!?_without_maven:0} - -# FIXME: Fedora lacks webwork and xwork, needed for the demo -%define _without_demo 1 - -# If you do not want to build samples in demo subpackage because of their -# runtime deps, give rpmbuild option '--without demo' -%define with_demo %{!?_without_demo:1}%{?_without_demo:0} - Name: xdoclet Version: 1.2.3 -Release: 12.4%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: XDoclet Attribute Orientated Programming Framework License: BSD @@ -63,89 +46,36 @@ Patch4: xdoclet-project_xml.patch Patch5: xdoclet-AbstractProgramElementTagsHandler.patch Patch6: xdoclet-build_docs_xml.patch -%if ! %{gcj_support} BuildArch: noarch -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 0:1.4.2 BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps >= 0:1.5 -BuildRequires: ant-trax -%if %{with_maven} -BuildRequires: maven >= 0:1.1 -%endif BuildRequires: junit BuildRequires: javacc BuildRequires: jrefactory BuildRequires: bsf -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-lang -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-net +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-net BuildRequires: log4j -BuildRequires: struts BuildRequires: velocity BuildRequires: xalan-j2 >= 0:2.7.0 BuildRequires: xml-commons-apis BuildRequires: xjavadoc >= 0:1.1 Requires: bsf -Requires: jakarta-commons-collections -Requires: jakarta-commons-logging +Requires: apache-commons-collections +Requires: apache-commons-logging Requires: log4j Requires: velocity Requires: xalan-j2 >= 0:2.7.0 Requires: xml-commons-apis Requires: xjavadoc = 0:1.1 -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description This package contains the XDoclet Attribute Orientated Programming Framework -%if %{with_demo} -%package demo -Summary: XDoclet Sample Projects -Group: Development/Framework -BuildRequires: servletapi4 -BuildRequires: struts -BuildRequires: velocity -BuildRequires: webwork >= 0:2.1 -BuildRequires: xwork -BuildRequires: geronimo-ejb-2.1-api -BuildRequires: myfaces -BuildRequires: geronimo-jms-1.1-api -BuildRequires: mx4j -Requires: %{name} = %{version}-%{release} -Requires: geronimo-ejb-2.1-api -Requires: myfaces -Requires: geronimo-jms-1.1-api -Requires: webwork -Requires: xwork -Requires: mx4j -Requires: struts -Requires: servletapi4 - -%description demo -This package contains sample XDoclet projects. -%endif - -%if %{with_maven} -%package maven-plugin -Summary: XDoclet Maven Plugin -Group: Development/Framework -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: maven >= 0:1.1 - -%description maven-plugin -%{summary}. -%endif - %package javadoc Summary: XDoclet Javadoc Group: Development/Documentation @@ -166,12 +96,6 @@ This package contains XDoclet documentation. find . -name "*.jar" -exec rm {} \; find . -name "*.class" -exec rm {} \; -# Replace JOnAS specific tasks with code blessed by ObjectWeb -#pushd modules -#mv objectweb objectweb.orig -#tar xzf %{SOURCE1} -#popd - # Remove mockobjects support. rm -rf modules/mockobjects @@ -179,16 +103,6 @@ for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-lo ln -s $(build-classpath $j) lib done -%if %{with_demo} -for j in servletapi4 struts velocity webwork-migration xwork geronimo-ejb-2.1-api myfaces/myfaces-jsf-api geronimo-jms-1.1-api; do - ln -s $(build-classpath $j) samples/lib -done -for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do - i=$(build-classpath $j) - ln -s $(build-classpath $j) samples/lib -done -%endif - %patch0 -b .sav %patch1 -b .sav %patch2 -b .sav @@ -198,33 +112,15 @@ done %patch6 -b .sav %build -export MAVEN_HOME=/usr/share/maven -export MAVEN_LOCAL_HOME=$(pwd)/.maven -%if %{with_maven} -ant -Dbuild.sysclasspath=first core modules maven docs l10n -%else ant -Dbuild.sysclasspath=first core modules docs l10n -%endif -%if %{with_demo} -ant samples -%endif %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name} -%if %{with_maven} -install -m 644 target/lib/maven-xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name} -%endif (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%if %{with_demo} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -%endif - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf target/docs/api mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -232,96 +128,24 @@ cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%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(-, root, root, -) %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}*.jar %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/LICENSE.txt -%if %{gcj_support} -%attr(-,root,root) %dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-apache-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-bea-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-borland-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-caucho-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ejb-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-exolab-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hibernate-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hp-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ibm-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-java-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jboss-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jdo-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jmx-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jsf-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-libelis-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-macromedia-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mvcsoft-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mx4j-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-objectweb-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-openejb-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-oracle-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-orion-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-portlet-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-pramati-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-solarmetric-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-spring-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sun-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sybase-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-tjdo-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-web-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-webwork-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-wsee-module-1.2.3.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-xdoclet-module-1.2.3.jar.* -%endif - -%if %{with_maven} -%files maven-plugin -%defattr(-, root, root, -) -%{_javadir}/%{name}/maven-%{name}*.jar -%endif - -%if %{with_demo} -%files demo -%defattr(-, root, root, -) -%{_datadir}/%{name}-%{version} -%endif - %files javadoc -%defattr(-, root, root, -) -%doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %files manual -%defattr(-, root, root, -) %doc %{_docdir}/%{name}-%{version} %changelog +* Tue Nov 29 2011 Alexander Kurtakov 0:1.2.3-13 +- Remove parts that are irrelevant to Fedora. +- Adapt to current guidelines. +- Drop demo - depending on struts which is no longer in the distro. + * Mon Feb 07 2011 Fedora Release Engineering - 0:1.2.3-12.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -431,4 +255,3 @@ fi * Fri Mar 05 2004 Ralph Apel - 0:1.2-1jpp - First JPackage release. - From c79979f39a9195f8a03936b507468fcb533a059c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:43:27 -0600 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xdoclet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdoclet.spec b/xdoclet.spec index c3c01c5..93ce0b2 100644 --- a/xdoclet.spec +++ b/xdoclet.spec @@ -30,7 +30,7 @@ Name: xdoclet Version: 1.2.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: XDoclet Attribute Orientated Programming Framework License: BSD @@ -141,6 +141,9 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc %{_docdir}/%{name}-%{version} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Nov 29 2011 Alexander Kurtakov 0:1.2.3-13 - Remove parts that are irrelevant to Fedora. - Adapt to current guidelines. From 26c0a8f2ca451f893337f68bf5a4d80b8ea1e832 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 27 Jan 2012 20:07:50 +0200 Subject: [PATCH 10/10] Dead upstream. --- .gitignore | 2 - dead.package | 1 + sources | 2 - ...et-AbstractProgramElementTagsHandler.patch | 11 - xdoclet-WebLogicSubTask.patch | 22 -- xdoclet-XDocletModulesEjbMessages.patch | 141 ---------- xdoclet-ant.not-required.patch | 257 ----------------- xdoclet-build_docs_xml.patch | 16 -- xdoclet-build_xml.patch | 68 ----- xdoclet-modules_common_ent.patch | 9 - xdoclet-project_xml.patch | 51 ---- xdoclet.spec | 260 ------------------ 12 files changed, 1 insertion(+), 839 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xdoclet-AbstractProgramElementTagsHandler.patch delete mode 100644 xdoclet-WebLogicSubTask.patch delete mode 100644 xdoclet-XDocletModulesEjbMessages.patch delete mode 100644 xdoclet-ant.not-required.patch delete mode 100644 xdoclet-build_docs_xml.patch delete mode 100644 xdoclet-build_xml.patch delete mode 100644 xdoclet-modules_common_ent.patch delete mode 100644 xdoclet-project_xml.patch delete mode 100644 xdoclet.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4f1dd19..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -xdoclet-src-1.2.3.tgz -xdoclet-modules-objectweb-4.6.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fb7b836 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Dead upstream. diff --git a/sources b/sources deleted file mode 100644 index dc2667f..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -9e1a2856e03b338b505a086b962a77ab xdoclet-src-1.2.3.tgz -a4bf2dddfcc204f538dfc633f0aeed30 xdoclet-modules-objectweb-4.6.tgz diff --git a/xdoclet-AbstractProgramElementTagsHandler.patch b/xdoclet-AbstractProgramElementTagsHandler.patch deleted file mode 100644 index 6c43720..0000000 --- a/xdoclet-AbstractProgramElementTagsHandler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java.sav 2006-06-08 11:58:43.000000000 +0200 -+++ core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java 2006-06-08 12:00:07.000000000 +0200 -@@ -728,7 +728,7 @@ - if (sort) { - // sort fields, but we should make a copy first, because members is not a new copy, it's shared by all - List sortedMembers = new ArrayList(members); -- -+ Collections.sort(sortedMembers); - members = sortedMembers; - } - diff --git a/xdoclet-WebLogicSubTask.patch b/xdoclet-WebLogicSubTask.patch deleted file mode 100644 index fb98234..0000000 --- a/xdoclet-WebLogicSubTask.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- modules/bea/src/xdoclet/modules/bea/wls/ejb/WebLogicSubTask.java.sav 2004-09-16 17:33:15.000000000 +0200 -+++ modules/bea/src/xdoclet/modules/bea/wls/ejb/WebLogicSubTask.java 2005-02-15 10:29:58.397360960 +0100 -@@ -304,7 +304,7 @@ - * Sets the persistence type to use. Useful if you're using a different persistence manager like MVCSoft - * - * @param persistence -- * @ant.not-required No, default is "weblogic" -+ * @ant.not-required "No, default is 'weblogic'" - */ - public void setPersistence(String persistence) - { -@@ -318,8 +318,8 @@ - * "DropAndCreateAlways", "AlterOrCreate" and "Disabled" for WLS Servers >= 8.1. - * - * @param flag The new Createtables value -- * @ant.not-required No, default is "False" for WLS Servers < Version 8.1 and "Disabled" for WLS Servers >= -- * 8.1 -+ * @ant.not-required "No, default is 'False' for WLS Servers < Version 8.1 and 'Disabled' for WLS Servers >= -+ * 8.1" - */ - public void setCreatetables(CreateTablesType flag) - { diff --git a/xdoclet-XDocletModulesEjbMessages.patch b/xdoclet-XDocletModulesEjbMessages.patch deleted file mode 100644 index 10cce8d..0000000 --- a/xdoclet-XDocletModulesEjbMessages.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- modules/ejb/src/xdoclet/modules/ejb/XDocletModulesEjbMessages.java.sav 2004-08-21 12:42:54.000000000 +0200 -+++ modules/ejb/src/xdoclet/modules/ejb/XDocletModulesEjbMessages.java 2005-02-15 11:34:41.950971072 +0100 -@@ -17,8 +17,7 @@ - public final static String DO_NOT_EDIT = "DO_NOT_EDIT"; - - /** -- * @msg.bundle msg="XDoclet can''t guess what CMP version to use for {0} because the task isn't used, -- * and there is no ejb:bean cmp-version tag. Please use one of them." -+ * @msg.bundle msg="XDoclet can''t guess what CMP version to use for {0} because the task isn't used, and there is no ejb:bean cmp-version tag. Please use one of them." - */ - public final static String CANT_GUESS_CMP_VERSION = "CANT_GUESS_CMP_VERSION"; - -@@ -127,8 +126,7 @@ - public final static String VALUE_OBJECT_FOR = "VALUE_OBJECT_FOR"; - - /** -- * @msg.bundle msg="A Value Object has an identity if the attributes making its Primary Key have all been set. An -- * object without identity is never equal to any other object." -+ * @msg.bundle msg="A Value Object has an identity if the attributes making its Primary Key have all been set. An object without identity is never equal to any other object." - */ - public final static String VALUE_OBJECT_IDENTITY_COMMENT = "VALUE_OBJECT_IDENTITY_COMMENT"; - -@@ -247,14 +245,12 @@ - public final static String RELATION_TOO_MANY_NAMES = "RELATION_TOO_MANY_NAMES"; - - /** -- * @msg.bundle msg="The relation with the name \"{0}\" declared in {1} seems to be unidirectional since it does -- * not occur anywhere else. The target-ejb parameter must therefore be specified." -+ * @msg.bundle msg="The relation with the name \"{0}\" declared in {1} seems to be unidirectional since it does not occur anywhere else. The target-ejb parameter must therefore be specified." - */ - public final static String RELATION_NEEDS_TARGET = "RELATION_NEEDS_TARGET"; - - /** -- * @msg.bundle msg="The relation with the name \"{0}\" declared in {1} seems to be bidirectional since it is -- * declared in two places. The target-ejb parameter must not be specified for bidirectional relationships." -+ * @msg.bundle msg="The relation with the name \"{0}\" declared in {1} seems to be bidirectional since it is declared in two places. The target-ejb parameter must not be specified for bidirectional relationships." - */ - public final static String RELATION_NEEDS_NO_TARGET = "RELATION_NEEDS_NO_TARGET"; - -@@ -275,6 +271,7 @@ - - /** - * @msg.bundle msg="\"Wrong version. Had \" + getVersion() + \", got \" + dataHolder.getVersion()" -+ * - */ - public final static String ENTITY_DATAHOLDER_VERSION = "ENTITY_DATAHOLDER_VERSION"; - -@@ -284,20 +281,17 @@ - public final static String SOFT_LOCK_VERSION = "SOFT_LOCK_VERSION"; - - /** -- * @msg.bundle msg="Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() -- * methods)." -+ * @msg.bundle msg="Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods)." - */ - public final static String UTIL_CACHED_REMOTE = "UTIL_CACHED_REMOTE"; - - /** -- * @msg.bundle msg="Cached queue (javax.jms.Queue). Uses lazy loading to obtain its value (loaded by getQueue() -- * methods)." -+ * @msg.bundle msg="Cached queue (javax.jms.Queue). Uses lazy loading to obtain its value (loaded by getQueue() methods)." - */ - public final static String UTIL_CACHED_QUEUE = "UTIL_CACHED_QUEUE"; - - /** -- * @msg.bundle msg="Cached topic (javax.jms.Topic). Uses lazy loading to obtain its value (loaded by getTopic() -- * methods)." -+ * @msg.bundle msg="Cached topic (javax.jms.Topic). Uses lazy loading to obtain its value (loaded by getTopic() methods)." - */ - public final static String UTIL_CACHED_TOPIC = "UTIL_CACHED_TOPIC"; - -@@ -307,8 +301,7 @@ - public final static String UTIL_CACHED_CONNECTION_FACTORY = "UTIL_CACHED_CONNECTION_FACTORY"; - - /** -- * @msg.bundle msg="Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by -- * getLocalHome() methods)." -+ * @msg.bundle msg="Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods)." - */ - public final static String UTIL_CACHED_LOCAL = "UTIL_CACHED_LOCAL"; - -@@ -338,7 +331,7 @@ - public final static String UTIL_OBTAIN_QUEUE_DEF_IC = "UTIL_OBTAIN_QUEUE_DEF_IC"; - - /** -- * @msg.bundle msg="Obtain destination topic from parameterised initial co ntext" -+ * @msg.bundle msg="Obtain destination topic from parameterised initial context" - */ - public final static String UTIL_OBTAIN_TOPIC_PARAM_IC = "UTIL_OBTAIN_TOPIC_PARAM_IC"; - -@@ -378,20 +371,17 @@ - public final static String UTIL_OBTAIN_IC = "UTIL_OBTAIN_IC"; - - /** -- * @msg.bundle msg="A 32 byte GUID generator (Globally Unique ID). These artificial keys SHOULD NOT -- * be seen by the user," -+ * @msg.bundle msg="A 32 byte GUID generator (Globally Unique ID). These artificial keys SHOULD NOT be seen by the user," - */ - public final static String UTIL_GUID_1 = "UTIL_GUID_1"; - - /** -- * @msg.bundle msg="not even touched by the DBA but with very rare exceptions, just manipulated by the database -- * and the programs." -+ * @msg.bundle msg="not even touched by the DBA but with very rare exceptions, just manipulated by the database and the programs." - */ - public final static String UTIL_GUID_2 = "UTIL_GUID_2"; - - /** -- * @msg.bundle msg="Usage: Add an id field (type java.lang.String) to your EJB, and add -- * setId(XXXUtil.generateGUID(this)); to the ejbCreate method." -+ * @msg.bundle msg="Usage: Add an id field (type java.lang.String) to your EJB, and add setId(XXXUtil.generateGUID(this)); to the ejbCreate method." - */ - public final static String UTIL_GUID_USAGE = "UTIL_GUID_USAGE"; - -@@ -437,14 +427,12 @@ - public final static String INTERFACE_IMPL_NOT_FOUND = "INTERFACE_IMPL_NOT_FOUND"; - - /** -- * @msg.bundle msg="''pattern'' parameter does not have a '''{0'}'' in it. '''{0'}'' is replaced by EJB name of -- * the class under processing." -+ * @msg.bundle msg="''pattern'' parameter does not have a '''{0'}'' in it. '''{0'}'' is replaced by EJB name of the class under processing." - */ - public final static String PATTERN_HAS_NO_PLACEHOLDER = "PATTERN_HAS_NO_PLACEHOLDER"; - - /** -- * @msg.bundle msg="Could not load the bean implementation class for interface ''{0}''! Make sure it's available -- * for ejbdoclet." -+ * @msg.bundle msg="Could not load the bean implementation class for interface ''{0}''! Make sure it's available for ejbdoclet." - */ - public final static String INTERFACE_IMPL_COULDNT_LOAD = "INTERFACE_IMPL_COULDNT_LOAD"; - -@@ -459,8 +447,7 @@ - public final static String NOT_DEFINED = "NOT_DEFINED"; - - /** -- * @msg.bundle msg="Class ''{0}'' should be defined abstract if you want the ''{1}'' sub-task to generate the -- * subclass properly." -+ * @msg.bundle msg="Class ''{0}'' should be defined abstract if you want the ''{1}'' sub-task to generate the subclass properly." - */ - public final static String CLASS_NOT_ABSTRACT = "CLASS_NOT_ABSTRACT"; - diff --git a/xdoclet-ant.not-required.patch b/xdoclet-ant.not-required.patch deleted file mode 100644 index 7176deb..0000000 --- a/xdoclet-ant.not-required.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff -ru core/src/xdoclet/TemplateSubTask.java.orig core/src/xdoclet/TemplateSubTask.java ---- core/src/xdoclet/TemplateSubTask.java.orig 2005-04-15 20:01:51.000000000 -0400 -+++ core/src/xdoclet/TemplateSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -245,7 +245,7 @@ - * Indicates whether or not to generate for interfaces. - * - * @param acceptInterfaces -- * @ant.not-required No, default is "true" -+ * @ant.not-required "No, default is 'true'" - */ - public void setAcceptInterfaces(boolean acceptInterfaces) - { -@@ -256,7 +256,7 @@ - * Indicates whether or not to generate for abstract classes. - * - * @param acceptAbstractClasses -- * @ant.not-required No, default is "true" -+ * @ant.not-required "No, default is 'true'" - */ - public void setAcceptAbstractClasses(boolean acceptAbstractClasses) - { -@@ -277,7 +277,7 @@ - * Indicates whether or not package substitution should be inherited - * - * @param packageSubstitutionInheritanceSupported The new PackageSubstitutionInheritanceSupported value -- * @ant.not-required No, default is "true" -+ * @ant.not-required "No, default is 'true'" - */ - public void setPackageSubstitutionInheritanceSupported(boolean packageSubstitutionInheritanceSupported) - { -@@ -299,7 +299,7 @@ - * Indicates whether or not to prefix with package structure. - * - * @param prefixWithPackageStructure The new PrefixWithPackageStructure value -- * @ant.not-required No, default is "true" -+ * @ant.not-required "No, default is 'true'" - */ - public void setPrefixWithPackageStructure(boolean prefixWithPackageStructure) - { -diff -ru core/src/xdoclet/XmlSubTask.java.orig core/src/xdoclet/XmlSubTask.java ---- core/src/xdoclet/XmlSubTask.java.orig 2005-04-15 20:01:51.000000000 -0400 -+++ core/src/xdoclet/XmlSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -129,7 +129,7 @@ - * available in some subtasks. - * - * @param useIds The new UseIds value -- * @ant.not-required No. Default is "false" -+ * @ant.not-required "No. Default is 'false'" - */ - public void setUseIds(boolean useIds) - { -@@ -141,7 +141,7 @@ - * to "ISO-8859-1". - * - * @param xmlEncoding The new Xmlencoding value -- * @ant.not-required No, default is "UTF-8" -+ * @ant.not-required "No, default is 'UTF-8'" - */ - public void setXmlencoding(String xmlEncoding) - { -diff -ru modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java.orig modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java ---- modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java.orig 2004-08-30 17:17:48.000000000 -0400 -+++ modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -101,7 +101,7 @@ - * Sets the struts version to use. Legal values are "1.0", "1.1" and "1.2". - * - * @param version -- * @ant.not-required No. Default is "1.0". -+ * @ant.not-required "No. Default is '1.0'". - */ - public void setVersion(StrutsVersion version) - { -diff -ru modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java.orig modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java ---- modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java.orig 2004-09-03 15:30:12.000000000 -0400 -+++ modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -56,7 +56,7 @@ - * specified, then ejbdoclet will generate EJB 2.0-compatible ejb-jar.xml file. - * - * @param ejbspec -- * @ant.not-required No. Default is "2.0" -+ * @ant.not-required "No. Default is '2.0'" - */ - public void setEjbSpec(EjbSpecVersion ejbspec) - { -@@ -68,7 +68,7 @@ - * no name parameter is specified in the ejb.bean tag. - * - * @param ejbClassNameSuffix -- * @ant.not-required No, Default is "Bean,EJB,Ejb" -+ * @ant.not-required "No, Default is 'Bean,EJB,Ejb'" - */ - public void setEjbClassNameSuffix(String ejbClassNameSuffix) - { -diff -ru modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java.orig modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java ---- modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java.orig 2005-04-15 20:02:25.000000000 -0400 -+++ modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -77,7 +77,7 @@ - * The pattern by which the data object classes are named. The placeholder "{0}" designates the EJB name. - * - * @param new_pattern The new Pattern value -- * @ant.not-required No, default is "{0}Data" -+ * @ant.not-required "No, default is '{0}Data'" - */ - public void setPattern(String new_pattern) - { -diff -ru modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java ---- modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java.orig 2005-04-15 20:02:25.000000000 -0400 -+++ modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -137,7 +137,7 @@ - * The pattern by which the value object classes are named. The placeholder "{0}" designates the EJB name. - * - * @param new_pattern The new Pattern value -- * @ant.not-required No, default is "{0}Value" -+ * @ant.not-required "No, default is '{0}Value'" - */ - public void setPattern(String new_pattern) - { -diff -ru modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java.orig modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java ---- modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java.orig 2005-04-15 20:02:44.000000000 -0400 -+++ modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -102,7 +102,7 @@ - * Sets the hibernate version to use. Legal values are "1.1", "2.0", "2.1" and "3.0". - * - * @param version -- * @ant.not-required No. Default is "1.1". -+ * @ant.not-required "No. Default is '1.1'". - */ - public void setVersion(HibernateVersion version) - { -diff -ru modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java.orig modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java ---- modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java.orig 2004-08-16 05:43:41.000000000 -0400 -+++ modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -94,8 +94,8 @@ - * The path to a local directory indicating where the container should passivate Stateful Session Bean instances. - * - * @param sfsbPassivationRoot The new SfsbPassivationRoot value -- * @ant.not-required No, only if hpas.bean passivation="true" tag is used on a stateful -- * session bean. Default is "". -+ * @ant.not-required "No, only if hpas.bean passivation='true' tag is used on a stateful -+ * session bean. Default is ''." - */ - public void setSfsbPassivationRoot(String sfsbPassivationRoot) - { -@@ -106,7 +106,7 @@ - * Only applies when using CMP. Specifies the name of a third party persistence manager product. - * - * @param persistenceProduct The new PersistenceProduct value -- * @ant.not-required No, default is "VXML". -+ * @ant.not-required "No, default is 'VXML'." - */ - public void setPersistenceProduct(String persistenceProduct) - { -@@ -117,7 +117,7 @@ - * Only applies when using CMP. Specifies the version of the third party product. - * - * @param persistenceVersion The new PersistenceVersion value -- * @ant.not-required No, default is "". -+ * @ant.not-required "No, default is ''." - */ - public void setPersistenceVersion(String persistenceVersion) - { -@@ -141,7 +141,7 @@ - * generated bean class name. - * - * @param persistenceSuffix The new PersistenceSuffix value -- * @ant.not-required No, default is "". -+ * @ant.not-required "No, default is ''." - */ - public void setPersistenceSuffix(String persistenceSuffix) - { -diff -ru modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java.orig modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java ---- modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java.orig 2004-08-16 05:46:28.000000000 -0400 -+++ modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -61,7 +61,7 @@ - * The version of Lido. Supported versions are 1.3. - * - * @param version The new Version value -- * @ant.not-required No, default is "1.3". -+ * @ant.not-required "No, default is '1.3'." - */ - public void setVersion(LidoVersionTypes version) - { -diff -ru modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java.orig modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java ---- modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java.orig 2002-10-03 16:47:38.000000000 -0400 -+++ modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -91,7 +91,7 @@ - * Sets the Connectionjndiname attribute of the MVCSoftSubTask object - * - * @param jndiName The new Connectionjndiname value -- * @ant.not-required No, default is "java:DefaultDS" -+ * @ant.not-required "No, default is 'java:DefaultDS'" - */ - public void setConnectionjndiname(String jndiName) - { -@@ -102,7 +102,7 @@ - * Sets the Loggingtype attribute of the MVCSoftSubTask object - * - * @param loggingType The new Loggingtype value -- * @ant.not-required No, default is "None" -+ * @ant.not-required "No, default is 'None'" - */ - public void setLoggingtype(String loggingType) - { -diff -ru modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java ---- modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig 2004-08-16 09:28:44.000000000 -0400 -+++ modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -61,7 +61,7 @@ - * The version of Kodo. Supported versions are 2.3. - * - * @param version The new Version value -- * @ant.not-required No, default is "2.3". -+ * @ant.not-required "No, default is '2.3'." - */ - public void setVersion(KodoVersionTypes version) - { -diff -ru modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java.orig modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java ---- modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java.orig 2003-03-29 19:28:18.000000000 -0500 -+++ modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -227,7 +227,7 @@ - * The SunONE/iPlanet version. Supported versions are 6.0, 6.5 and 7.0. - * - * @param version The new Version value -- * @ant.not-required No, default is "7.0". -+ * @ant.not-required "No, default is '7.0'." - */ - public void setVersion(SunONEVersionTypes version) - { -@@ -238,7 +238,7 @@ - * Optional default transaction manager type for all components. Allowed values are 'local' and 'global'. - * - * @param transactionManagerType "local" or "global" -- * @ant.not-required Only used for version = 6.5, and optional even then. -+ * @ant.not-required "Only used for version = 6.5, and optional even then." - */ - public void setTransactionManagerType(String transactionManagerType) - { -@@ -249,7 +249,7 @@ - * Specifies the absolute jndi-name of the database to be used for storing CMP beans in the EJB JAR file. - * - * @param cmpResourceJndiName String containing the JNDI name -- * @ant.not-required Only used for version = 7.0, and optional even then. -+ * @ant.not-required "Only used for version = 7.0, and optional even then." - */ - public void setCmpResourceJndiName(String cmpResourceJndiName) - { -diff -ru modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java.orig modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java ---- modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java.orig 2004-08-16 09:29:00.000000000 -0400 -+++ modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java 2008-10-05 22:23:51.000000000 -0400 -@@ -57,7 +57,7 @@ - * The version of TJDO. Supported versions are 2.0. - * - * @param version The new Version value -- * @ant.not-required No, default is "2.0". -+ * @ant.not-required "No, default is '2.0'." - */ - public void setVersion(TJDOVersionTypes version) - { diff --git a/xdoclet-build_docs_xml.patch b/xdoclet-build_docs_xml.patch deleted file mode 100644 index 61da7da..0000000 --- a/xdoclet-build_docs_xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- build-docs.xml.orig 2005-12-19 09:32:16.000000000 -0500 -+++ build-docs.xml 2005-12-19 15:00:11.000000000 -0500 -@@ -113,10 +113,10 @@ - footer="<a href="http://xdoclet.sourceforge.net/">http://xdoclet.sourceforge.net/</a>"> - - -- -+ - -- -- -+ -+ - - - diff --git a/xdoclet-build_xml.patch b/xdoclet-build_xml.patch deleted file mode 100644 index bc9d1e6..0000000 --- a/xdoclet-build_xml.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- core/build.xml.orig 2004-06-29 16:56:35.151350000 +0200 -+++ core/build.xml 2004-06-29 16:56:52.281395000 +0200 -@@ -94,7 +94,7 @@ - - - -+ classpath="${lib.dir}/jrefactory.jar"/> - - - ---- modules/modules-common.ent.orig 2004-06-29 17:19:10.494768000 +0200 -+++ modules/modules-common.ent 2004-06-29 17:19:33.364834000 +0200 -@@ -225,7 +225,7 @@ - - - -+ classpath="${lib.dir}/jrefactory.jar"/> - - - ---- build.xml.orig 2004-06-21 15:14:10.000000000 -0400 -+++ build.xml 2005-03-07 12:34:42.000000000 -0500 -@@ -6,6 +6,7 @@ - - - -+ - - - - - -- -+ - XJavaDoc sources are available. Checking against ${xjavadoc.jar} - -@@ -36,7 +37,7 @@ - The XJavaDoc binaries are up to date. No need to build. - - -- -+ - - XJavaDoc's sources are not available in ${basedir}/../xjavadoc - Trying to download xjavadoc via HTTP. If you're behind a proxy, you should uncomment -@@ -49,7 +50,7 @@ - dest="${xjavadoc.jar}"/> - - -- -+ - - - -@@ -145,7 +146,7 @@ - - - -- -+ - - - diff --git a/xdoclet-modules_common_ent.patch b/xdoclet-modules_common_ent.patch deleted file mode 100644 index 8db9e5f..0000000 --- a/xdoclet-modules_common_ent.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- modules/modules-common.ent.orig 2005-02-23 15:47:39.000000000 -0500 -+++ modules/modules-common.ent 2005-02-23 17:25:17.000000000 -0500 -@@ -294,5 +294,6 @@ - out="${module.tag.doclipse.file}" - extension=".xml" - style="${docs.stylesheets.dir}/doclipse.xslt"> -+ - - diff --git a/xdoclet-project_xml.patch b/xdoclet-project_xml.patch deleted file mode 100644 index 49de535..0000000 --- a/xdoclet-project_xml.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- project.xml.sav 2005-04-16 02:01:41.000000000 +0200 -+++ project.xml 2006-02-21 18:15:29.000000000 +0100 -@@ -276,7 +276,6 @@ - - - Andreas "Mad" Schaefer -- schaefera - schaefera@users.sourceforge.net - JBossGroup - -@@ -301,7 +300,6 @@ - - - Christian Amor Kvalheim -- christkv - christkv@users.sourceforge.net - - -@@ -381,7 +379,6 @@ - - - Joel Rosi-Schwatz -- joelrs - joelrs@users.sourceforge.net - - Hibernate Module -@@ -539,7 +536,6 @@ - - - Vincent Harcq -- vharcq - vharcq@users.sourceforge.net - - EJB Module - Value Objects -@@ -591,12 +587,12 @@ - - - -- maven-changelog-plugin -- maven-changes-plugin -- maven-developer-activity-plugin -+ -+ -+ - - -- maven-file-activity-plugin -+ - maven-linkcheck-plugin - - diff --git a/xdoclet.spec b/xdoclet.spec deleted file mode 100644 index 93ce0b2..0000000 --- a/xdoclet.spec +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright (c) 2000-2007, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -Name: xdoclet -Version: 1.2.3 -Release: 14%{?dist} -Epoch: 0 -Summary: XDoclet Attribute Orientated Programming Framework -License: BSD -Group: Development/Framework -URL: http://xdoclet.sourceforge.net -Source0: http://superb-east.dl.sourceforge.net/sourceforge/xdoclet/xdoclet-src-1.2.3.tgz -#Source1: %{name}-modules-objectweb-4.6.tgz -Patch0: xdoclet-build_xml.patch -Patch1: xdoclet-XDocletModulesEjbMessages.patch -Patch2: xdoclet-ant.not-required.patch -Patch3: xdoclet-WebLogicSubTask.patch -Patch4: xdoclet-project_xml.patch -Patch5: xdoclet-AbstractProgramElementTagsHandler.patch -Patch6: xdoclet-build_docs_xml.patch - -BuildArch: noarch -BuildRequires: java-devel >= 0:1.4.2 -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: ant >= 0:1.6 -BuildRequires: junit -BuildRequires: javacc -BuildRequires: jrefactory -BuildRequires: bsf -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-lang -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-net -BuildRequires: log4j -BuildRequires: velocity -BuildRequires: xalan-j2 >= 0:2.7.0 -BuildRequires: xml-commons-apis -BuildRequires: xjavadoc >= 0:1.1 - -Requires: bsf -Requires: apache-commons-collections -Requires: apache-commons-logging -Requires: log4j -Requires: velocity -Requires: xalan-j2 >= 0:2.7.0 -Requires: xml-commons-apis -Requires: xjavadoc = 0:1.1 - -%description -This package contains the XDoclet Attribute Orientated Programming Framework - -%package javadoc -Summary: XDoclet Javadoc -Group: Development/Documentation - -%description javadoc -This package contains XDoclet javadoc - -%package manual -Summary: XDoclet Sample Manuals and Documentation -Group: Development/Documentation - -%description manual -This package contains XDoclet documentation. - -%prep -%setup -q -# Remove binary information in the source tar -find . -name "*.jar" -exec rm {} \; -find . -name "*.class" -exec rm {} \; - -# Remove mockobjects support. -rm -rf modules/mockobjects - -for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis; do - ln -s $(build-classpath $j) lib -done - -%patch0 -b .sav -%patch1 -b .sav -%patch2 -b .sav -%patch3 -b .sav -%patch4 -b .sav -%patch5 -b .sav -%patch6 -b .sav - -%build -ant -Dbuild.sysclasspath=first core modules docs l10n - -%install -mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} -install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name} -(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -rm -rf target/docs/api - -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%files -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}*.jar -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/LICENSE.txt - -%files javadoc -%doc %{_javadocdir}/%{name} - -%files manual -%doc %{_docdir}/%{name}-%{version} - -%changelog -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.2.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Alexander Kurtakov 0:1.2.3-13 -- Remove parts that are irrelevant to Fedora. -- Adapt to current guidelines. -- Drop demo - depending on struts which is no longer in the distro. - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.2.3-12.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.2.3-11.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.2.3-10.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Oct 05 2008 Matt Wringe - 0:1.2.3-9.4 -- Update xdoclet-ant.not-required.patch to apply with fuzz=0. - -* Fri Aug 29 2008 Michael Schwendt - 0:1.2.3-9.3 -- include /usr/share/doc/xdoclet-1.2.3 directory - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.2.3-9.2 -- drop repotag -- fix license tag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.3-9jpp.1 -- Autorebuild for GCC 4.3 - -* Wed Apr 25 2007 Matt Wringe - 0:1.2.3-8jpp.1 -- Merge with newest jpp version -- Fix some rpm lint warnings - -* Tue Apr 11 2007 Thomas Fitzsimmons - 0:1.2.3-7jpp.3 -- Remove mockobjects requirements. - -* Wed Mar 07 2007 Ralph Apel - 0:1.2.3-8jpp -- Optionally build without maven -- Separate out maven-xdoclet-plugin into own subpackage -- Reactivate demo, now that webwork and xwork are available -- No native xdoclet-maven-plugin - - -* Fri Aug 04 2006 Matt Wringe - 0:1.2.3-7jpp.2 -- Rebuild with define with_gcj_support - -* Thu Aug 03 2006 Matt Wringe - 0:1.2.3-7jpp.1 -- Merge with upstream version -- Remove unnecessary define with_gcj_support -- Add missing javadoc requires -- Add missing javadoc postun - -* Wed Jul 26 2006 Matt Wringe - 0:1.2.3-6jpp_4fc -- Remove xalan-j2 and xalan-j2-serializer from the ant OPT_JAR_LIST - -* Mon Jul 23 2006 Matt Wringe - 0:1.2.3-6jpp_3fc -- Rebuild on new gcj - -* Sun Jul 23 2006 Matt Wringe - 0:1.2.3-6jpp_2fc -- Rebuild - -* Sat Jul 22 2006 Matt Wringe - 0:1.2.3-6jpp_1fc -- Merge with upstream version -- Remove dependency on maven, use ant instead -- Natively compile jpackages - -* Sat Jul 22 2006 Matt Wringe - 0:1.2.3-6jpp -- Add conditional native compiling -- Add missing buildrequires: ant-nodeps and ant-trax -- Add missing javadoc %%ghost symlink - -* Thu Jun 08 2006 Fernando Nasser - 0:1.2.3-5jpp -- Update objectweb module to match JOnAS 4.6.x -- Build without demo because JPP 1.7 lacks webwork and xwork - -* Thu Jun 08 2006 Ralph Apel - 0:1.2.3-4jpp -- Patch AbstractProgramElementTagsHandler to sort members, - Thx Jesus Rodriguez - -* Thu Apr 06 2006 Ralph Apel - 0:1.2.3-3jpp -- Replace non-free (B)Rs in -demo with free ones - -* Tue Feb 21 2006 Ralph Apel - 0:1.2.3-2jpp -- Adapt project.xml (docs) to maven-1.1 - -* Tue Dec 20 2005 Ralph Apel - 0:1.2.3-1jpp -- Upgrade to 1.2.3 -- Build docs with maven - -* Fri Sep 23 2005 Ralph Apel - 0:1.2.2-3jpp -- Adapt to build samples with webwork-2.1.7 - -* Fri Mar 04 2005 Fernando Nasser - 0:1.2.2-2jpp -- Add patch to prevent attempt to load DTD from the net, when it comes with - the source and is locally available -- Replace JOnAS specific tasks with code blessed by ObjectWeb -- Do not save copies of the java files when patching. - -* Tue Feb 15 2005 Ralph Apel - 0:1.2.2-1jpp -- Upgrade to 1.2.2 -- Add jsf requirement for demo -- Drop jndi requirement for demo -- Drop servletapi and mx4j requirement for main package -- Buildrequire maven and use it to build docs - -* Thu Aug 26 2004 Ralph Apel - 0:1.2.1-2jpp -- Build with ant-1.6.2 - -* Fri Jul 02 2004 Ralph Apel - 0:1.2.1-1jpp -- Upgrade to 1.2.1 -- Relax build-time dependencies -- Relax dependency versions -- Make subpackage xdoclet-demo optional - -* Fri Mar 05 2004 Ralph Apel - 0:1.2-1jpp -- First JPackage release.