rpms/plexus-cdc/F-12 plexus-cdc-qdox-1.9.patch, NONE, 1.1 plexus-cdc.spec, 1.12, 1.13

[mef]

Author: mef

Update of /cvs/pkgs/rpms/plexus-cdc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4540

Modified Files:
	plexus-cdc.spec 
Added Files:
	plexus-cdc-qdox-1.9.patch 
Log Message:
Copy devel changes to F-12

plexus-cdc-qdox-1.9.patch:
 ComponentGleaner.java              |    4 ++--
 PlexusDefaultComponentGleaner.java |   16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE plexus-cdc-qdox-1.9.patch ---
--- a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+++ b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
@@ -26,8 +26,8 @@
 
 import com.thoughtworks.qdox.model.DocletTag;
 import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaClassCache;
 import com.thoughtworks.qdox.model.JavaField;
+import com.thoughtworks.qdox.JavaDocBuilder;
 import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
 import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
@@ -92,7 +92,7 @@
     // ComponentGleaner Implementation
     // ----------------------------------------------------------------------
 
-    public ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
+    public ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
         throws ComponentDescriptorCreatorException
     {
         DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
@@ -268,7 +268,11 @@ 
 
             String fqn = ifc.getFullyQualifiedName();
 
-            String pkg = ifc.getPackage();
+            String pkg = null;
+            if ( ifc.getPackage() != null )
+            {
+                pkg = ifc.getPackage().getName();
+            }
 
             if ( pkg == null )
             {
@@ -292,7 +292,7 @@
                     // prepend the gleaned class' package
                     // -----------------------------------------------------------------------
 
-                    pkg = javaClass.getPackage();
+                    pkg = javaClass.getPackage().getName();
 
                     fqn = pkg + "." + fqn;
                 }
@@ -335,7 +335,7 @@
         return role;
     }
 
-    private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
+    private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor componentDescriptor,
                                    JavaClass javaClass )
     {
         JavaField[] fields = javaClass.getFields();
@@ -445,7 +445,7 @@
 
                 JavaClass roleClass = classCache.getClassByName( role );
 
-                if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
+                if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage().getName() ) )
                 {
                     role = javaClass.getPackage() + "." + roleClass.getName();
                 }

--- a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+++ b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
@@ -25,7 +25,7 @@
  */
 
 import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaClassCache;
+import com.thoughtworks.qdox.JavaDocBuilder;
 import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
 
 /**
@@ -39,6 +39,6 @@
 {
     String ROLE = ComponentGleaner.class.getName();
 
-    ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
+    ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
         throws ComponentDescriptorCreatorException;
 }



Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/F-12/plexus-cdc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- plexus-cdc.spec	20 Aug 2009 19:39:17 -0000	1.12
+++ plexus-cdc.spec	22 Jan 2010 13:43:58 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.5.a10.1.1%{?dist}
+Release:        0.6.a10.1.3%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
@@ -48,6 +48,7 @@ URL:            http://plexus.codehaus.o
 # tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
 Source0:        %{name}-1.0-alpha-10.tar.gz
 Source1:	%{name}-jpp-depmap.xml
+Patch0:     %{name}-qdox-1.9.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +66,7 @@ BuildRequires:	maven2-common-poms >= 1.0
 BuildRequires:	jdom
 BuildRequires:	plexus-container-default
 BuildRequires:	plexus-utils
+BuildRequires:  maven-doxia-sitetools
 BuildRequires:	qdox
 Requires:		jdom
 Requires:		maven2-common-poms >= 1.0
@@ -95,6 +97,7 @@ Javadoc for %{name}.
 
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
+%patch0 -p1
 
 
 %build
@@ -105,6 +108,7 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
         -e \
 		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 
@@ -152,6 +156,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 0:1.0-0.6.a10.1.3
+- Fix NULL dereference in the qdox patch
+
+* Mon Nov 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.5.a10.1.3
+- BR maven-doxia-sitetools.
+
+* Mon Nov 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.5.a10.1.2
+- Fix build with qdox 1.9.
+
 * Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a10.1.1
 - Update to alpha 10 (courtesy Deepak Bhole)
 - Remove gcj support