rpms/xdoclet/devel xdoclet-ant.not-required.patch, 1.4, 1.5 xdoclet.spec, 1.32, 1.33

Matt Wringe mwringe at fedoraproject.org
Mon Oct 6 03:00:11 UTC 2008 

Author: mwringe

Update of /cvs/pkgs/rpms/xdoclet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32334

Modified Files:
	xdoclet-ant.not-required.patch xdoclet.spec 
Log Message:
Update xdoclet-ant.not-required.patch to apply with fuzz=0


xdoclet-ant.not-required.patch:

Index: xdoclet-ant.not-required.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xdoclet/devel/xdoclet-ant.not-required.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdoclet-ant.not-required.patch	26 Apr 2007 00:09:22 -0000	1.4
+++ xdoclet-ant.not-required.patch	6 Oct 2008 03:00:11 -0000	1.5
@@ -1,5 +1,6 @@
---- core/src/xdoclet/TemplateSubTask.java.orig	2004-06-30 20:48:43.000000000 +0200
-+++ core/src/xdoclet/TemplateSubTask.java	2004-06-30 20:28:05.000000000 +0200
+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.
       *
@@ -27,7 +28,7 @@
       */
      public void setPackageSubstitutionInheritanceSupported(boolean packageSubstitutionInheritanceSupported)
      {
-@@ -298,7 +298,7 @@
+@@ -299,7 +299,7 @@
       * Indicates whether or not to prefix with package structure.
       *
       * @param prefixWithPackageStructure  The new PrefixWithPackageStructure value
@@ -36,9 +37,10 @@
       */
      public void setPrefixWithPackageStructure(boolean prefixWithPackageStructure)
      {
---- core/src/xdoclet/XmlSubTask.java.orig	2004-06-30 20:48:43.000000000 +0200
-+++ core/src/xdoclet/XmlSubTask.java	2004-06-30 20:28:43.000000000 +0200
-@@ -112,7 +112,7 @@
+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
@@ -47,7 +49,7 @@
       */
      public void setUseIds(boolean useIds)
      {
-@@ -124,7 +124,7 @@
+@@ -141,7 +141,7 @@
       * to "ISO-8859-1".
       *
       * @param xmlEncoding  The new Xmlencoding value
@@ -56,10 +58,11 @@
       */
      public void setXmlencoding(String xmlEncoding)
      {
---- modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java	2004-06-30 20:29:23.000000000 +0200
-@@ -97,7 +97,7 @@
-      * Sets the struts version to use. Legal values are "1.0" and "1.1".
+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".
@@ -67,31 +70,10 @@
       */
      public void setVersion(StrutsVersion version)
      {
---- modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java	2004-06-30 20:30:26.000000000 +0200
-@@ -76,7 +76,7 @@
-      * The pattern by which the data object classes are named. {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)
-     {
---- modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java	2004-06-30 20:31:00.000000000 +0200
-@@ -133,7 +133,7 @@
-      * The pattern by which the value object classes are named. {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)
-     {
---- modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java	2004-06-30 20:32:13.000000000 +0200
-@@ -55,7 +55,7 @@
+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
@@ -100,7 +82,7 @@
       */
      public void setEjbSpec(EjbSpecVersion ejbspec)
      {
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
       * no name parameter is specified in the <a href="../../../../tags/ejb-tags.html#@ejb.bean">ejb.bean</a> tag.
       *
       * @param ejbClassNameSuffix
@@ -109,10 +91,35 @@
       */
      public void setEjbClassNameSuffix(String ejbClassNameSuffix)
      {
---- modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java	2004-06-30 20:33:08.000000000 +0200
-@@ -95,7 +95,7 @@
-      * Sets the hibernate version to use. Legal values are "1.1" and "2.0".
+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".
@@ -120,9 +127,10 @@
       */
      public void setVersion(HibernateVersion version)
      {
---- modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java	2004-06-30 20:35:15.000000000 +0200
-@@ -97,8 +97,8 @@
+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
@@ -133,7 +141,7 @@
       */
      public void setSfsbPassivationRoot(String sfsbPassivationRoot)
      {
-@@ -109,7 +109,7 @@
+@@ -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
@@ -142,7 +150,7 @@
       */
      public void setPersistenceProduct(String persistenceProduct)
      {
-@@ -120,7 +120,7 @@
+@@ -117,7 +117,7 @@
       * Only applies when using CMP. Specifies the version of the third party product.
       *
       * @param persistenceVersion  The new PersistenceVersion value
@@ -151,7 +159,7 @@
       */
      public void setPersistenceVersion(String persistenceVersion)
      {
-@@ -144,7 +144,7 @@
+@@ -141,7 +141,7 @@
       * generated bean class name.
       *
       * @param persistenceSuffix  The new PersistenceSuffix value
@@ -160,9 +168,10 @@
       */
      public void setPersistenceSuffix(String persistenceSuffix)
      {
---- modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java.orig	2004-06-30 20:49:01.000000000 +0200
-+++ modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java	2004-06-30 20:38:11.000000000 +0200
-@@ -63,7 +63,7 @@
+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
@@ -171,8 +180,9 @@
       */
      public void setVersion(LidoVersionTypes version)
      {
---- modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java	2004-06-30 20:38:48.000000000 +0200
+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
       *
@@ -191,9 +201,10 @@
       */
      public void setLoggingtype(String loggingType)
      {
---- modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java	2004-06-30 20:40:02.000000000 +0200
-@@ -63,7 +63,7 @@
+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
@@ -202,8 +213,9 @@
       */
      public void setVersion(KodoVersionTypes version)
      {
---- modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java	2004-06-30 20:40:57.000000000 +0200
+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.
       *
@@ -231,9 +243,10 @@
       */
      public void setCmpResourceJndiName(String cmpResourceJndiName)
      {
---- modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java	2004-06-30 20:41:15.000000000 +0200
-@@ -64,7 +64,7 @@
+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


Index: xdoclet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xdoclet.spec	29 Aug 2008 10:09:06 -0000	1.32
+++ xdoclet.spec	6 Oct 2008 03:00:11 -0000	1.33
@@ -47,7 +47,7 @@
 
 Name:           xdoclet
 Version:        1.2.3
-Release:        9.3%{?dist}
+Release:        9.4%{?dist}
 Epoch:          0
 Summary:        XDoclet Attribute Orientated Programming Framework
 License:        BSD       
@@ -82,7 +82,7 @@
 BuildRequires:  jakarta-commons-collections 
 BuildRequires:  jakarta-commons-lang 
 BuildRequires:  jakarta-commons-logging 
-#BuildRequires:  jakarta-commons-net 
+BuildRequires:  jakarta-commons-net 
 BuildRequires:  log4j
 BuildRequires:  struts 
 BuildRequires:  velocity 
@@ -191,7 +191,7 @@
 
 %patch0 -b .sav
 %patch1 -b .sav
-%patch2 
+%patch2 -b .sav 
 %patch3 -b .sav
 %patch4 -b .sav
 %patch5 -b .sav
@@ -322,6 +322,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Sun Oct 05 2008 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-9.4
+- Update xdoclet-ant.not-required.patch to apply with fuzz=0.
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0:1.2.3-9.3
 - include /usr/share/doc/xdoclet-1.2.3 directory

More information about the scm-commits mailing list