Index: jxr/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/jxr/plugin.jelly,v
retrieving revision 1.22
diff -u -b -r1.22 plugin.jelly
--- jxr/plugin.jelly	23 Aug 2004 13:12:44 -0000	1.22
+++ jxr/plugin.jelly	19 Apr 2005 20:59:24 -0000
@@ -68,6 +68,50 @@
     name="maven-jxr-plugin:report"
     description="Generate HTML cross reference sources">
 
+    <j:set scope="parent" var="internal_jxr_working_dir"  value="${maven.build.dir}/jxr"/>
+    <j:set scope="parent" var="internal_jxr_src_tmp"      value="${internal_jxr_working_dir}/src"/>
+    <ant:mkdir dir="${internal_jxr_working_dir}"/>
+    <ant:mkdir dir="${internal_jxr_src_tmp}"/>
+        
+    <echo>sourceDir=${pom.build.sourceDirectory}</echo>
+    <echo>sourceSet=${context.getAntProject().getReferences().get('maven.compile.src.set')}</echo>
+    
+        <!-- test if sourceModifications are defined -->
+        <j:if test="${pom.build.sourceModifications!=null and !pom.build.sourceModifications.isEmpty()}">
+          <ant:echo>sourceModifications used.</ant:echo>
+          <util:tokenize var="sources_dirs" delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+          <ant:copy todir="${internal_jxr_src_tmp}">
+            <j:forEach var="dir" items="${sources_dirs}">
+              <ant:fileset dir="${dir}">
+                <ant:include name="**/*.java"/>
+                <ant:include name="**/doc-files/**/*"/>
+                <!-- handle source modifications -->
+                <j:forEach var="sm" items="${pom.build.sourceModifications}">
+                  <ant:available property="classPresent" classname="${sm.className}"/>
+                  <j:if test="${classPresent != 'true'}">
+                    <j:forEach var="exclude" items="${sm.excludes}">
+                      <ant:exclude name="${exclude}"/>
+                    </j:forEach> <!-- end sourceModification exclude -->
+                    <j:forEach var="include" items="${sm.includes}">
+                      <ant:include name="${include}"/>
+                    </j:forEach> <!-- end sourceModification include -->
+                  </j:if>
+                </j:forEach> <!-- end sourceModification -->
+              </ant:fileset>
+            </j:forEach>
+          </ant:copy>
+          <ant:path id="internal_jxr_sources">
+            <ant:pathelement location="${internal_jxr_src_tmp}"/>
+          </ant:path>
+        </j:if>
+        <!-- test if sourceModifications aren't defined -->
+        <j:if test="${pom.build.sourceModifications==null || pom.build.sourceModifications.isEmpty()}">
+          <ant:echo>sourceModifications not used.</ant:echo>
+          <ant:path id="internal_jxr_sources">
+            <ant:pathelement path="${context.getAntProject().getReferences().get('maven.compile.src.set')}"/>
+          </ant:path>
+        </j:if>
+        
     <j:if test="${sourcesPresent == 'true'}">
 
       <ant:mkdir dir="${maven.jxr.destdir}"/>
@@ -75,7 +119,7 @@
       <!-- If the 'startDir' attribute changes we need to update
            CodeTransform.java in o.a.m.jxr, this will be fixed. -->
 
-      <ant:echo>${maven.sourcesPresent}</ant:echo>
+      <ant:echo>sourcesPresent=${maven.sourcesPresent}</ant:echo>
 
       <maven:pluginVar var="javadocDestdir" plugin='maven-javadoc-plugin' property='maven.javadoc.destdir'/>
 
@@ -93,8 +137,12 @@
       <ant:copy file="${maven.jxr.stylesheet}"
         tofile="${maven.jxr.destdir}/stylesheet.css"/>
         
+      <pathconvert pathsep=";" property="internal_jxr_prop" refid="internal_jxr_sources"/>
+      
+      <ant:echo>sourceDir=${internal_jxr_prop}</ant:echo>
+      
       <jxr:jxr
-        sourceDir="${pom.build.sourceDirectory}"
+        sourceDir="${internal_jxr_prop}"
         destDir="${maven.jxr.destdir}"
         inputEncoding="${inputEncoding}"
         outputEncoding="${outputEncoding}"
@@ -105,6 +153,9 @@
         bottom="${copyright}">
       </jxr:jxr>
 
+      <ant:delete dir="${internal_jxr_src_tmp}"/>
+      <ant:delete dir="${internal_jxr_working_dir}"/>
+
       <j:if test="${unitTestSourcesPresent == 'true'}">
         <ant:mkdir dir="${maven.jxr.destdir.test}"/>
     
Index: jxr/src/main/org/apache/maven/jxr/CodeTransform.java
===================================================================
RCS file: /home/cvspublic/maven-plugins/jxr/src/main/org/apache/maven/jxr/CodeTransform.java,v
retrieving revision 1.11
diff -u -b -r1.11 CodeTransform.java
--- jxr/src/main/org/apache/maven/jxr/CodeTransform.java	23 Aug 2004 13:12:44 -0000	1.11
+++ jxr/src/main/org/apache/maven/jxr/CodeTransform.java	19 Apr 2005 20:59:27 -0000
@@ -445,7 +445,7 @@
         {
             temp.setLength(0);
             ch = line.charAt(i);
-            while (i < line.length() && ((ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122)))
+            while (i < line.length() && ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')))
             {
                 temp.append(ch);
                 i++;
@@ -1100,13 +1100,20 @@
             - that it WILL be on the disk since this is based on the current
             - file.
         */
-        boolean isPackage = line.indexOf("package") != -1;
+        boolean isPackage = false, isImport = false;
 
-        if (line.indexOf("import") != -1 || isPackage)
-        {
-
-            start = line.trim().indexOf(" ");
+        int i = line.indexOf("package ");
+        if (i != -1) {
+            if (i > 0) isPackage = !Character.isJavaIdentifierPart(line.charAt(i-1));
+            else isPackage = true;
+        }
+        if (isPackage) start = i+7;
+        int j = line.indexOf("import ");
+        if (j != -1) {
+            if (j > 0) isImport = !Character.isJavaIdentifierPart(line.charAt(j-1));
+            else isImport = true;
         }
+        if (isImport) start = j+6;
 
         if (start != -1)
         {