rpms/plexus-cdc/devel plexus-cdc-qdox-1.9.patch, 1.3, 1.4 plexus-cdc.spec, 1.16, 1.17

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/plexus-cdc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31510

Modified Files:
	plexus-cdc-qdox-1.9.patch plexus-cdc.spec 
Log Message:
Fully update qdox patch



plexus-cdc-qdox-1.9.patch:
 ComponentGleaner.java               |    4 ++--
 PlexusDefaultComponentGleaner.java  |   16 ++++++++++------
 gleaner/QDoxComponentGleaner.java   |   14 +++++++-------
 gleaner/SourceComponentGleaner.java |    6 +++---
 4 files changed, 22 insertions(+), 18 deletions(-)

Index: plexus-cdc-qdox-1.9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc-qdox-1.9.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- plexus-cdc-qdox-1.9.patch	24 Jun 2010 11:31:26 -0000	1.3
+++ plexus-cdc-qdox-1.9.patch	24 Jun 2010 12:34:48 -0000	1.4
@@ -82,9 +82,27 @@ index 80d6941..0ddc3f4 100644
                      role = javaClass.getPackage() + "." + roleClass.getName();
                  }
 diff --git a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
-index e3e35bb..f09479d 100644
+index e3e35bb..b35b32f 100644
 --- a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
 +++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+@@ -35,7 +35,7 @@ import java.util.Map;
+ 
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ import com.thoughtworks.qdox.model.JavaField;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+@@ -91,7 +91,7 @@ public class QDoxComponentGleaner
+     // ComponentGleaner Implementation
+     // ----------------------------------------------------------------------
+ 
+-    public ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++    public ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
+         throws ComponentGleanerException
+     {
+         DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
 @@ -271,7 +271,7 @@ public class QDoxComponentGleaner
  
              String fqn = ifc.getFullyQualifiedName();
@@ -103,6 +121,15 @@ index e3e35bb..f09479d 100644
  
                      fqn = pkg + "." + fqn;
                  }
+@@ -331,7 +331,7 @@ public class QDoxComponentGleaner
+         return role;
+     }
+ 
+-    private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
++    private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor componentDescriptor,
+                                    JavaClass javaClass )
+     {
+         JavaField[] fields = javaClass.getFields();
 @@ -441,7 +441,7 @@ public class QDoxComponentGleaner
  
                  JavaClass roleClass = classCache.getClassByName( role );
@@ -119,3 +146,25 @@ index e3e35bb..f09479d 100644
 -}
 \ No newline at end of file
 +}
+diff --git a/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
+index e7ee5ba..4355862 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
+@@ -17,7 +17,7 @@
+ package org.codehaus.plexus.cdc.gleaner;
+ 
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ import org.codehaus.plexus.cdc.gleaner.ComponentGleanerException;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ 
+@@ -30,5 +30,5 @@ public interface SourceComponentGleaner
+ {
+     String ROLE = SourceComponentGleaner.class.getName();
+ 
+-    ComponentDescriptor glean(JavaClassCache classCache, JavaClass javaClass) throws ComponentGleanerException;
+-}
+\ No newline at end of file
++    ComponentDescriptor glean(JavaDocBuilder classCache, JavaClass javaClass) throws ComponentGleanerException;
++}


Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- plexus-cdc.spec	24 Jun 2010 11:31:26 -0000	1.16
+++ plexus-cdc.spec	24 Jun 2010 12:34:48 -0000	1.17
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.7.a14%{?dist}
+Release:        0.8.a14%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Jun 24 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.8.a14
+- Update qdox patch
+
 * Thu Jun 24 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.7.a14
 - Update to latest version, update qdox patch
 - Cleanup specfile a bit, fix release tag