added checks for missing docs

6 files changed, 26 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc.ant b/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
index 49c30eb0cb..a7a6e86ce4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
@@ -63,7 +63,8 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/APIVIZ/bin;${additional.jars}/jdepend-2.9.1.jar">
+			<doclet name="org.jboss.apiviz.APIviz"
+			        path="${additional.jars}/APIVIZ/bin;${additional.jars}/APIVIZ/lib/jdepend-2.9.1.jar">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<!--
diff --git a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
index de833dc85d..f2496c2a8a 100644
--- a/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
+++ b/plugins/org.eclipse.emf.cdo.releng/javadoc/javadocTemplate.ant
@@ -61,7 +61,8 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/APIVIZ/bin;${additional.jars}/jdepend-2.9.1.jar">
+			<doclet name="org.jboss.apiviz.APIviz"
+			        path="${additional.jars}/APIVIZ/bin;${additional.jars}/APIVIZ/lib/jdepend-2.9.1.jar">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<!--
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
index e490b643c6..2bc808da01 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
@@ -94,7 +94,7 @@ public class AssembleJavaDocOptions
     {

       for (SourcePlugin sourcePlugin : javaDoc.getSourcePlugins())

       {

-        sourcePlugin.convertPackageInfos();

+        sourcePlugin.validatePackageInfos();

       }

     }

 

@@ -452,20 +452,30 @@ public class AssembleJavaDocOptions
       return getLabel().compareTo(o.getLabel());

     }

 

-    public void convertPackageInfos() throws IOException

+    public void validatePackageInfos() throws IOException

     {

       Set<String> packageNames2 = getPackageNames();

       for (String packageName : packageNames2)

       {

-        File packageHtml = new File(getProject(), "src/" + packageName.replace('.', '/') + "/package.html");

-        if (packageHtml.isFile())

+        File packageFolder = new File(getProject(), "src/" + packageName.replace('.', '/'));

+        File packageInfo = new File(packageFolder, "package-info.java");

+        if (!packageInfo.isFile())

         {

-          convertPackageInfo(packageHtml, packageName);

+          File packageHtml = new File(packageFolder, "package.html");

+          if (packageHtml.isFile())

+          {

+            convertPackageHTML(packageHtml, packageInfo, packageName);

+          }

+

+          if (!packageInfo.isFile())

+          {

+            System.err.println("Package info missing: " + packageInfo.getCanonicalPath());

+          }

         }

       }

     }

 

-    private void convertPackageInfo(File packageHtml, String packageName) throws IOException

+    private void convertPackageHTML(File packageHtml, File packageInfo, String packageName) throws IOException

     {

       int length = (int)packageHtml.length();

       char[] content = new char[length];

@@ -498,7 +508,6 @@ public class AssembleJavaDocOptions
 

       System.out.println("Converting " + packageHtml.getCanonicalPath());

       String comment = matcher.group(1);

-      File packageInfo = new File(packageHtml.getParentFile(), "package-info.java");

       FileWriter out = null;

 

       try

diff --git a/plugins/org.eclipse.net4j.db.doc/javadoc.ant b/plugins/org.eclipse.net4j.db.doc/javadoc.ant
index 72ef4cf0b4..a6697d12e5 100644
--- a/plugins/org.eclipse.net4j.db.doc/javadoc.ant
+++ b/plugins/org.eclipse.net4j.db.doc/javadoc.ant
@@ -63,7 +63,8 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/APIVIZ/bin;${additional.jars}/jdepend-2.9.1.jar">
+			<doclet name="org.jboss.apiviz.APIviz"
+			        path="${additional.jars}/APIVIZ/bin;${additional.jars}/APIVIZ/lib/jdepend-2.9.1.jar">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<!--
diff --git a/plugins/org.eclipse.net4j.doc/javadoc.ant b/plugins/org.eclipse.net4j.doc/javadoc.ant
index 6a37bb1c9a..69bc76ffd3 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc.ant
+++ b/plugins/org.eclipse.net4j.doc/javadoc.ant
@@ -63,7 +63,8 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/APIVIZ/bin;${additional.jars}/jdepend-2.9.1.jar">
+			<doclet name="org.jboss.apiviz.APIviz"
+			        path="${additional.jars}/APIVIZ/bin;${additional.jars}/APIVIZ/lib/jdepend-2.9.1.jar">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<!--
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc.ant b/plugins/org.eclipse.net4j.util.doc/javadoc.ant
index a55adbd3ef..d3ed2c0a7b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc.ant
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc.ant
@@ -63,7 +63,8 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/APIVIZ/bin;${additional.jars}/jdepend-2.9.1.jar">
+			<doclet name="org.jboss.apiviz.APIviz"
+			        path="${additional.jars}/APIVIZ/bin;${additional.jars}/APIVIZ/lib/jdepend-2.9.1.jar">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<!--