Hello community,
here is the log from the commit of package xdoclet for openSUSE:Factory
checked in at Fri Dec 11 17:32:28 CET 2009.
--------
--- xdoclet/xdoclet.changes 2009-08-05 11:28:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdoclet/xdoclet.changes 2009-12-11 16:52:32.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Dec 11 15:08:20 UTC 2009 - mvyskocil@suse.cz
+
+- refreshed patches
+ * xdoclet-AbstractProgramElementTagsHandler.patch
+ * xdoclet-XDocletModulesEjbMessages.patch
+ * xdoclet-ant.not-required.patch
+ * xdoclet-build_xml.patch
+- build-classpath in %%prep never fails (to be able to use quilt for work with
+ patches)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdoclet.spec ++++++
--- /var/tmp/diff_new_pack.fKstmI/_old 2009-12-11 17:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.fKstmI/_new 2009-12-11 17:31:31.000000000 +0100
@@ -38,7 +38,7 @@
Name: xdoclet
Version: 1.2.3
-Release: 3
+Release: 4
Summary: XDoclet Attribute Orientated Programming Framework
# BSD-style, see http://xdoclet.sourceforge.net/xdoclet/licenses/xdoclet-license.html
License: BSD
@@ -129,7 +129,7 @@
tar xf %{SOURCE1}
popd
for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis mockobjects-core; do
- ln -s $(build-classpath $j) lib
+ 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
++++++ xdoclet-AbstractProgramElementTagsHandler.patch ++++++
--- /var/tmp/diff_new_pack.fKstmI/_old 2009-12-11 17:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.fKstmI/_new 2009-12-11 17:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- 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 @@
+Index: core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java
+===================================================================
+--- core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java.orig 2009-12-11 16:07:17.086051325 +0100
++++ core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java 2009-12-11 16:07:44.311050535 +0100
+@@ -716,7 +716,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);
++++++ xdoclet-ant.not-required.patch ++++++
--- /var/tmp/diff_new_pack.fKstmI/_old 2009-12-11 17:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.fKstmI/_new 2009-12-11 17:31:31.000000000 +0100
@@ -1,5 +1,7 @@
---- 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
+Index: core/src/xdoclet/TemplateSubTask.java
+===================================================================
+--- core/src/xdoclet/TemplateSubTask.java.orig 2009-12-11 16:07:17.201926063 +0100
++++ core/src/xdoclet/TemplateSubTask.java 2009-12-11 16:07:36.073925566 +0100
@@ -245,7 +245,7 @@
* Indicates whether or not to generate for interfaces.
*
@@ -27,7 +29,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 +38,11 @@
*/
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 @@
+Index: core/src/xdoclet/XmlSubTask.java
+===================================================================
+--- core/src/xdoclet/XmlSubTask.java.orig 2009-12-11 16:07:17.201926063 +0100
++++ core/src/xdoclet/XmlSubTask.java 2009-12-11 16:07:36.073925566 +0100
+@@ -129,7 +129,7 @@
* available in some subtasks.
*
* @param useIds The new UseIds value
@@ -47,7 +51,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 +60,12 @@
*/
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".
+Index: modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java
+===================================================================
+--- modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java.orig 2009-12-11 16:07:17.202925843 +0100
++++ modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java 2009-12-11 16:07:36.144925933 +0100
+@@ -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,10 +73,12 @@
*/
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.
+Index: modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java
+===================================================================
+--- modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java.orig 2009-12-11 16:07:17.202925843 +0100
++++ modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java 2009-12-11 16:07:36.162051095 +0100
+@@ -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"
@@ -78,10 +86,12 @@
*/
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.
+Index: modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java
+===================================================================
+--- modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java.orig 2009-12-11 16:07:17.203925948 +0100
++++ modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java 2009-12-11 16:07:36.177925969 +0100
+@@ -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"
@@ -89,9 +99,11 @@
*/
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 @@
+Index: modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java
+===================================================================
+--- modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java.orig 2009-12-11 16:07:17.203925948 +0100
++++ modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java 2009-12-11 16:07:36.194926143 +0100
+@@ -56,7 +56,7 @@
* specified, then ejbdoclet will generate EJB 2.0-compatible ejb-jar.xml file.
*
* @param ejbspec
@@ -100,7 +112,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 +121,12 @@
*/
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".
+Index: modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java
+===================================================================
+--- modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java.orig 2009-12-11 16:07:17.203925948 +0100
++++ modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java 2009-12-11 16:07:36.245926131 +0100
+@@ -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 +134,11 @@
*/
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 @@
+Index: modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java
+===================================================================
+--- modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java.orig 2009-12-11 16:07:17.204925488 +0100
++++ modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java 2009-12-11 16:07:36.261925803 +0100
+@@ -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 +149,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 +158,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 +167,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 +176,11 @@
*/
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 @@
+Index: modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java
+===================================================================
+--- modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java.orig 2009-12-11 16:07:17.204925488 +0100
++++ modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java 2009-12-11 16:07:36.278926007 +0100
+@@ -61,7 +61,7 @@
* The version of Lido. Supported versions are 1.3.
*
* @param version The new Version value
@@ -171,8 +189,10 @@
*/
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
+Index: modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java
+===================================================================
+--- modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java.orig 2009-12-11 16:07:17.205925679 +0100
++++ modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java 2009-12-11 16:07:36.295925876 +0100
@@ -91,7 +91,7 @@
* Sets the Connectionjndiname attribute of the MVCSoftSubTask object
*
@@ -191,8 +211,10 @@
*/
public void setLoggingtype(String loggingType)
{
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig 2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java 2004-06-30 20:39:18.000000000 +0200
+Index: modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java
+===================================================================
+--- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig 2009-12-11 16:07:17.205925679 +0100
++++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java 2009-12-11 16:07:36.346051467 +0100
@@ -228,7 +228,7 @@
* Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
*
@@ -202,9 +224,11 @@
*/
public void setVersion(JonasVersionTypes version)
{
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java.orig 2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java 2004-06-30 20:39:43.000000000 +0200
-@@ -127,7 +127,7 @@
+Index: modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java
+===================================================================
+--- modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java.orig 2009-12-11 16:07:17.206926835 +0100
++++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java 2009-12-11 16:07:36.361923879 +0100
+@@ -138,7 +138,7 @@
* Sets the version of JOnAS. Supported versions are: 2.6.
*
* @param version The new version value. Supported versions are: 2.6.
@@ -213,9 +237,11 @@
*/
public void setVersion(JonasVersionTypes version)
{
---- 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 @@
+Index: modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java
+===================================================================
+--- modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig 2009-12-11 16:07:17.206926835 +0100
++++ modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java 2009-12-11 16:07:36.378926096 +0100
+@@ -61,7 +61,7 @@
* The version of Kodo. Supported versions are 2.3.
*
* @param version The new Version value
@@ -224,8 +250,10 @@
*/
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
+Index: modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java
+===================================================================
+--- modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java.orig 2009-12-11 16:07:17.207945843 +0100
++++ modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java 2009-12-11 16:07:36.430050944 +0100
@@ -227,7 +227,7 @@
* The SunONE/iPlanet version. Supported versions are 6.0, 6.5 and 7.0.
*
@@ -253,9 +281,11 @@
*/
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 @@
+Index: modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java
+===================================================================
+--- modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java.orig 2009-12-11 16:07:17.242091353 +0100
++++ modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java 2009-12-11 16:07:36.445925934 +0100
+@@ -57,7 +57,7 @@
* The version of TJDO. Supported versions are 2.0.
*
* @param version The new Version value
++++++ xdoclet-build_xml.patch ++++++
--- /var/tmp/diff_new_pack.fKstmI/_old 2009-12-11 17:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.fKstmI/_new 2009-12-11 17:31:31.000000000 +0100
@@ -1,5 +1,7 @@
---- core/build.xml.orig 2004-06-29 16:56:35.151350000 +0200
-+++ core/build.xml 2004-06-29 16:56:52.281395000 +0200
+Index: core/build.xml
+===================================================================
+--- core/build.xml.orig 2009-12-11 16:07:17.381925536 +0100
++++ core/build.xml 2009-12-11 16:07:21.807050295 +0100
@@ -94,7 +94,7 @@
<!-- =================================================================== -->
<target name="beautify" depends="prepare">
@@ -9,9 +11,11 @@
<pretty settingsDir="${config.dir}" cvs="true" compileDir="${core.classes.dir}">
<fileset dir="${core.src.dir}">
---- 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 @@
+Index: modules/modules-common.ent
+===================================================================
+--- modules/modules-common.ent.orig 2009-12-11 16:07:17.381925536 +0100
++++ modules/modules-common.ent 2009-12-11 16:07:21.808050808 +0100
+@@ -226,7 +226,7 @@
<target name="beautify" depends="init" unless="module.jar.uptodate">