svn commit: r911632 - in /sling/trunk/maven/maven-jcrocm-plugin: pom.xml src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java

[fmeschbe]

Author: fmeschbe
Date: Thu Feb 18 22:50:29 2010
New Revision: 911632

URL: http://svn.apache.org/viewvc?rev=911632&view=rev
Log:
SLING-1392 Apply patches by Róbert Csákány (thanks)

Modified:
    sling/trunk/maven/maven-jcrocm-plugin/pom.xml
    
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java

Modified: sling/trunk/maven/maven-jcrocm-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/pom.xml?rev=911632&r1=911631&r2=911632&view=diff
==============================================================================
--- sling/trunk/maven/maven-jcrocm-plugin/pom.xml (original)
+++ sling/trunk/maven/maven-jcrocm-plugin/pom.xml Thu Feb 18 22:50:29 2010
@@ -83,9 +83,9 @@
                </dependency>
 
                <dependency>
-                       <groupId>qdox</groupId>
+            <groupId>com.thoughtworks.qdox</groupId>
                        <artifactId>qdox</artifactId>
-                       <version>1.6.1</version>
+            <version>1.9.1</version>
                </dependency>
        </dependencies>
 </project>

Modified: 
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java?rev=911632&r1=911631&r2=911632&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java
 (original)
+++ 
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/AbstractDescriptorElement.java
 Thu Feb 18 22:50:29 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.sling.maven.jcrocm;
 
+import com.thoughtworks.qdox.model.AbstractBaseJavaEntity;
 import org.apache.maven.plugin.logging.Log;
 
 import com.thoughtworks.qdox.model.AbstractJavaEntity;
@@ -43,7 +44,7 @@
     abstract void generate(XMLWriter xmlWriter);
 
     JavaClass getJavaClass() {
-        AbstractJavaEntity aje = tag.getContext();
+        AbstractBaseJavaEntity aje = tag.getContext();
         if (aje instanceof JavaClass) {
             return (JavaClass) aje;
         }
@@ -58,7 +59,7 @@
 
     protected void log(String message) {
         log.error("@" + tag.getName() + ": " + message + " ("
-            + tag.getContext().getSource().getURL() + ", line "
+            + tag.getContext().getName() + ", line "
             + tag.getLineNumber() + ")");
     }