Major refactoring of Javadoc generation.v201209241555

11 files changed, 134 insertions, 79 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
index b33164154c..64b5797792 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
@@ -12,6 +12,9 @@ customBuildCallbacks=customBuildCallbacks.xml
 
 bin.includes = META-INF/,\
                  doc.bin.log,\
+                 jptSourcepath.tmp.properties,\
+                 jptClasspath.tmp.properties,\
+                 jptPackages.tmp.properties,\
                  jptOptions.tmp.txt,\
                plugin.xml,\
                plugin.properties,\
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
index 18a4b80132..9f27601597 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
@@ -13,8 +13,23 @@
 
 	<target name="init">
 		<available file="${basedir}/index" property="index.present"/>
-		<delete file="jptOptions.tmp.txt"/>
-		<delete file="jptClasspath.tmp.properties"/>
+		<path location="${basedir}/../../../eclipse/plugins" id="pluginsInstallDir"/>
+		<pathconvert property="base.plugins.install.dir" refid="pluginsInstallDir"/>
+		<property name="optionsFile" value="jptOptions.tmp.txt" />
+		<property name="sourcepathFile" value="jptSourcepath.tmp.properties" />
+		<property name="classpathFile" value="jptClasspath.tmp.properties" />
+		<property name="packagesFile" value="jptPackages.tmp.properties" />
+		<condition property="pathSeparator" value=":">
+			<os family="unix" />
+		</condition>
+		<condition property="pathSeparator" value=";">
+			<os family="windows" />
+		</condition>
+
+		<delete file="${optionsFile}"/>
+		<delete file="${sourcepathFile}"/>
+		<delete file="${classpathFile}"/>
+		<delete file="${packagesFile}"/>
 	</target>
 
 	<target name="all" depends="init" unless="index.present">
@@ -35,37 +50,37 @@
 
 	<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
 		<echo message="#### jpt.doc.isv #### - java.home = ${java.home}" />
-		<echo message="${base.install.dir} NOT SET" />
-		<echo message="${install.destination} NOT SET" />
-		
-		<property name="base.install.dir" value="../../../eclipse/plugins" />
-		
-		<property name="optionsFile" value="jptOptions.tmp.txt" />
-		<copy file="jptOptions.txt" tofile="${optionsFile}" overwrite="true" />
-		<copy file="jptClasspath.template" tofile="jptClasspath.tmp.properties" overwrite="true" />
+		<echo message="base.plugins.install.dir = ${base.plugins.install.dir}" />
 
-		<condition property="pathSeparator" value=":">
-			<os family="unix" />
-		</condition>
-		<condition property="pathSeparator" value=";">
-			<os family="windows" />
-		</condition>
+		<copy file="jptOptions.template" tofile="${optionsFile}" overwrite="true" />
+		<copy file="jptSourcepath.template" tofile="${sourcepathFile}" overwrite="true" />
+		<copy file="jptClasspath.template" tofile="${classpathFile}" overwrite="true" />
+		<copy file="jptPackages.template" tofile="${packagesFile}" overwrite="true" />
 
-        <antcall target="replaceRtTokens" />
-		
-        <antcall target="replaceWtpRtTokens" />
- 
-        <antcall target="replacePackageTokens">
-            <param name="packageName" value="jpt.common.utility" />
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.common.utility" />
+        </antcall>
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.common.core" />
         </antcall>
-        <antcall target="replacePackageTokens">
-            <param name="packageName" value="jpt.common.core" />
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.common.ui" />
         </antcall>
-        <antcall target="replacePackageTokens">
-            <param name="packageName" value="jpt.common.ui" />
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.jpa.core" />
+        </antcall>
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.jpa.db" />
+        </antcall>
+        <antcall target="addBundle">
+            <param name="bundleName" value="jpt.jpa.ui" />
         </antcall>
 
-        <antcall target="replaceJptRtTokens" />
+        <antcall target="replaceRtToken" />
+        <antcall target="replaceJptRtToken" />
+        <antcall target="replaceWtpRtToken" />
+        <antcall target="replaceJptSourcepathToken" />
+        <antcall target="replacePackagesToken" />
 
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match=";" replace="${pathSeparator}" />
 
@@ -79,8 +94,8 @@
 		</exec>
 	</target>
 
-	<!-- replaceRtTokens -->
-	<target name="replaceRtTokens" if="optionsFile" >
+	<!-- replaceRtToken -->
+	<target name="replaceRtToken" if="optionsFile" >
 		<fileset id="jreJars" dir="${java.home}/lib">
 		    <include name="*.jar" />
 		</fileset>
@@ -88,37 +103,40 @@
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${jreClasspath}" />
 	</target>
 
-	<!-- replaceWtpRtTokens -->
-	<target name="replaceWtpRtTokens" if="optionsFile" >
-		<fileset id="wtpJars" dir="${base.install.dir}">
+	<!-- replaceWtpRtToken -->
+	<target name="replaceWtpRtToken" if="optionsFile" >
+		<fileset id="wtpJars" dir="${base.plugins.install.dir}">
 		    <include name="*.jar" />
 		</fileset>
 		<pathconvert pathsep="${pathSeparator}" property="wtpClasspath" refid="wtpJars"/>
 		<replace file="${basedir}/${optionsFile}" token="@wtprt@" value="${wtpClasspath}" />
 	</target>
 
-	<!-- replaceJptRtTokens -->
-	<target name="replaceJptRtTokens" if="optionsFile" >
-		<property file="jptClasspath.tmp.properties" />
+	<!-- replaceJptRtToken -->
+	<target name="replaceJptRtToken" if="optionsFile" >
+		<property file="${classpathFile}" />
 		<replace file="${basedir}/${optionsFile}" token="@jptrt@" value="${jptClasspath}" />
 	</target>
 
-	<!-- replacePackageTokens -->
-	<target name="replacePackageTokens" if="optionsFile">
-		<echo message="${packageName}" />
-		<replace 
-			file="${basedir}/${optionsFile}" 
-			propertyfile="${basedir}/${packageName}.properties">
-
-            <replacefilter
-                token="@${packageName}.sourcepath@"
-                property="${packageName}.sourcepath"/>
-            <replacefilter
-                token="@${packageName}.packages@"
-                property="${packageName}.packages"/>
-		</replace>
-
-		<echo file="jptClasspath.tmp.properties" message="../org.eclipse.${packageName}/@dot;" append="true"/>
+	<!-- replaceJptSourcepathToken -->
+	<target name="replaceJptSourcepathToken" if="optionsFile" >
+		<property file="${sourcepathFile}" />
+		<replace file="${basedir}/${optionsFile}" token="@jptsourcepath@" value="${jptSourcepath}" />
+	</target>
+
+	<!-- replacePackagesToken -->
+	<target name="replacePackagesToken" if="optionsFile" >
+		<property file="${packagesFile}" />
+		<replace file="${basedir}/${optionsFile}" token="@jptPackages@" value="${jptPackages}" />
+	</target>
+	
+	<!-- addBundle -->
+	<target name="addBundle" if="optionsFile" >
+		<echo message="${bundleName}" />
+		<property file="${basedir}/${bundleName}.properties" />
+		<echo file="${sourcepathFile}" message="../org.eclipse.${bundleName}/src;" append="true"/>
+		<echo file="${classpathFile}" message="../org.eclipse.${bundleName}/@dot;" append="true"/>
+		<echo file="${packagesFile}" message="${jptPackages} " append="true"/>
 	</target>
 
 	<target name="buildJptDoc" unless="jpt.index.present">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties
index 0e93c58813..ec109b0aa0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties
@@ -1,12 +1,10 @@
-jpt.common.core.sourcepath = ../org.eclipse.jpt.common.core/src
-
-jpt.common.core.packages = org.eclipse.jpt.common.core\n\
-								org.eclipse.jpt.common.core.gen\n\
-								org.eclipse.jpt.common.core.libprov\n\
-								org.eclipse.jpt.common.core.libval\n\
-								org.eclipse.jpt.common.core.resource\n\
-								org.eclipse.jpt.common.core.resource.java\n\
-								org.eclipse.jpt.common.core.resource.xml\n\
-								org.eclipse.jpt.common.core.utility\n\
-								org.eclipse.jpt.common.core.utility.command\n\
+jptPackages = org.eclipse.jpt.common.core \
+								org.eclipse.jpt.common.core.gen \
+								org.eclipse.jpt.common.core.libprov \
+								org.eclipse.jpt.common.core.libval \
+								org.eclipse.jpt.common.core.resource \
+								org.eclipse.jpt.common.core.resource.java \
+								org.eclipse.jpt.common.core.resource.xml \
+								org.eclipse.jpt.common.core.utility \
+								org.eclipse.jpt.common.core.utility.command \
 								org.eclipse.jpt.common.core.utility.jdt
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
index 632182ec75..94f6b1df17 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
@@ -1,5 +1,3 @@
-jpt.common.ui.sourcepath = ../org.eclipse.jpt.common.ui/src
-
-jpt.common.ui.packages = org.eclipse.jpt.common.ui\n\
-								org.eclipse.jpt.common.ui.gen\n\
+jptPackages = org.eclipse.jpt.common.ui \
+								org.eclipse.jpt.common.ui.gen \
 								org.eclipse.jpt.common.ui.jface
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties
index a04b1b0952..42bf221893 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties
@@ -1,9 +1,7 @@
-jpt.common.utility.sourcepath = ../org.eclipse.jpt.common.utility/src
-
-jpt.common.utility.packages = org.eclipse.jpt.common.utility\n\
-								org.eclipse.jpt.common.utility.command\n\
-								org.eclipse.jpt.common.utility.model\n\
-								org.eclipse.jpt.common.utility.model.event\n\
-								org.eclipse.jpt.common.utility.model.listener\n\
-								org.eclipse.jpt.common.utility.model.value\n\
+jptPackages = org.eclipse.jpt.common.utility \
+								org.eclipse.jpt.common.utility.command \
+								org.eclipse.jpt.common.utility.model \
+								org.eclipse.jpt.common.utility.model.event \
+								org.eclipse.jpt.common.utility.model.listener \
+								org.eclipse.jpt.common.utility.model.value \
 								org.eclipse.jpt.common.utility.synchronizers
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.core.properties
new file mode 100644
index 0000000000..8563a602e9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.core.properties
@@ -0,0 +1,23 @@
+jptPackages = org.eclipse.jpt.jpa.core \
+								org.eclipse.jpt.jpa.core.context \
+								org.eclipse.jpt.jpa.core.context.java \
+								org.eclipse.jpt.jpa.core.context.orm \
+								org.eclipse.jpt.jpa.core.context.persistence \
+								org.eclipse.jpt.jpa.core.jpa2 \
+								org.eclipse.jpt.jpa.core.jpa2.context \
+								org.eclipse.jpt.jpa.core.jpa2.context.java \
+								org.eclipse.jpt.jpa.core.jpa2.context.orm \
+								org.eclipse.jpt.jpa.core.jpa2.context.persistence \
+								org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection \
+								org.eclipse.jpt.jpa.core.jpa2.context.persistence.options \
+								org.eclipse.jpt.jpa.core.jpa2.resource.java \
+								org.eclipse.jpt.jpa.core.jpql \
+								org.eclipse.jpt.jpa.core.jpql.spi \
+								org.eclipse.jpt.jpa.core.libprov \
+								org.eclipse.jpt.jpa.core.platform \
+								org.eclipse.jpt.jpa.core.resource \
+								org.eclipse.jpt.jpa.core.resource.java \
+								org.eclipse.jpt.jpa.core.resource.orm \
+								org.eclipse.jpt.jpa.core.resource.orm.v2_0 \
+								org.eclipse.jpt.jpa.core.resource.persistence \
+								org.eclipse.jpt.jpa.core.resource.persistence.v2_0
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.db.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.db.properties
new file mode 100644
index 0000000000..a0b5936082
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.db.properties
@@ -0,0 +1 @@
+jptPackages = org.eclipse.jpt.jpa.db
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.ui.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.ui.properties
new file mode 100644
index 0000000000..e88c0f3352
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.ui.properties
@@ -0,0 +1,8 @@
+jptPackages = org.eclipse.jpt.jpa.ui \
+								org.eclipse.jpt.jpa.ui.details \
+								org.eclipse.jpt.jpa.ui.details.java \
+								org.eclipse.jpt.jpa.ui.details.orm \
+								org.eclipse.jpt.jpa.ui.editors \
+								org.eclipse.jpt.jpa.ui.jpa2.details.java \
+								org.eclipse.jpt.jpa.ui.jpa2.details.orm \
+								org.eclipse.jpt.jpa.ui.selection
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
index 11dcd61044..ceac632cf2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
@@ -1,5 +1,5 @@
 -charset "utf-8"
--sourcepath "@jpt.common.utility.sourcepath@;@jpt.common.core.sourcepath@;@jpt.common.ui.sourcepath@"
+-sourcepath "@jptsourcepath@"
 -classpath @rt@;@jptrt@;@wtprt@
 -breakiterator
 -use
@@ -10,8 +10,14 @@
 -header "<b>Dali Provisional API</b><br>Release 3.2"
 -bottom "Copyright (c) 2012 Oracle. All rights reserved."
 -link http://docs.oracle.com/javase/6/docs/api/
+-link http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/
+-link http://help.eclipse.org/juno/topic/org.eclipse.platform.doc.isv/reference/api/
+-link http://help.eclipse.org/juno/topic/org.eclipse.platform.doc.isv/reference/extension-points/
+-link http://help.eclipse.org/juno/topic/org.eclipse.jdt.doc.isv/reference/api/
+-link http://help.eclipse.org/juno/topic/org.eclipse.emf.facet.doc/javadoc/
+-link http://www.osgi.org/javadoc/r4v43/core/
+#-link http://download.eclipse.org/modeling/emf/emf/javadoc/xsd/2.8.0/
+#-link http://www.eclipse.org/eclipselink/api/2.4/
 
-#JPT common API packages
-@jpt.common.utility.packages@
-@jpt.common.core.packages@
-@jpt.common.ui.packages@
+# Dali packages
+@jptPackages@
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptPackages.template b/jpa/plugins/org.eclipse.jpt.doc.isv/jptPackages.template
new file mode 100644
index 0000000000..adc44025de
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptPackages.template
@@ -0,0 +1 @@
+jptPackages = 
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptSourcepath.template b/jpa/plugins/org.eclipse.jpt.doc.isv/jptSourcepath.template
new file mode 100644
index 0000000000..6358aa2eec
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptSourcepath.template
@@ -0,0 +1 @@
+jptSourcepath = 
\ No newline at end of file