Clean up Javadoc generation.
diff --git a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml
index 7e544e6..4f43654 100644
--- a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml
+++ b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml
@@ -68,13 +68,6 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.eclipse.jpt.doc.isv"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
<plugin
id="org.eclipse.persistence.jpa.jpql"
diff --git a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
index c7e48a1..220e614 100644
--- a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
+++ b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
@@ -26,5 +26,12 @@
<includes
id="org.eclipse.jpt.jpa.feature.source"
version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.jpt.doc.isv"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
index 64b5797..6d84e6b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
@@ -11,11 +11,6 @@
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,\
about.html,\
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
index a581610..ea5270e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
@@ -8,13 +8,12 @@
Contributors:
Oracle - initial API and implementation
-->
-
<project name="JPT Doc ISV Build" default="all" basedir="." >
-
<target name="init">
<available file="${basedir}/index" property="index.present"/>
<path location="${basedir}/../../../eclipse/plugins" id="pluginsInstallDir"/>
<pathconvert property="base.plugins.install.dir" refid="pluginsInstallDir"/>
+ <property name="java.bin" value="${java.home}/../bin" />
<property name="optionsFile" value="jptOptions.tmp.txt" />
<property name="sourcepathFile" value="jptSourcepath.tmp.properties" />
<property name="classpathFile" value="jptClasspath.tmp.properties" />
@@ -32,6 +31,11 @@
<delete file="${packagesFile}"/>
</target>
+ <target name="getJavadocPath">
+ <available file="${java.bin}/javadoc.exe" property="javadoc" value="${java.bin}/javadoc.exe"/>
+ <available file="${java.bin}/javadoc" property="javadoc" value="${java.bin}/javadoc" />
+ </target>
+
<target name="all" depends="init" unless="index.present">
<!-- antcall target="convertSchemaToHtml" /-->
<antcall target="generateJavadoc" />
@@ -39,20 +43,10 @@
<!-- antcall target="createDocZip" /-->
</target>
- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jpt.doc.isv." if="eclipse.running">
- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
- </target>
-
- <target name="getJavadocPath">
- <available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe"/>
- <available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
- </target>
-
<!-- generateJavadoc -->
<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
<echo message="#### jpt.doc.isv #### - java.home = ${java.home}" />
<echo message="base.plugins.install.dir = ${base.plugins.install.dir}" />
-
<copy file="jptOptions.template" tofile="${optionsFile}" overwrite="true" />
<copy file="jptSourcepath.template" tofile="${sourcepathFile}" overwrite="true" />
<copy file="jptClasspath.template" tofile="${classpathFile}" overwrite="true" />
@@ -114,7 +108,7 @@
<delete dir="org"/>
<delete dir="resources"/>
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
+ <exec dir="." executable="${javadoc}" output="jptJavadoc.log">
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
</exec>
</target>
@@ -168,11 +162,14 @@
<ant antfile="buildDoc.xml" dir="../org.eclipse.jpt.doc.isv" />
</target>
+ <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jpt.doc.isv." if="eclipse.running">
+ <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+ </target>
+
<target name="createDocZip">
<zip zipfile="${basedir}/doc.zip"
basedir="${basedir}"
includes="schema.css, book.css, notices.html, about.html, concepts/**, guide/**, tips/**, reference/**, tasks/**, whatsNew/**, images/**"
/>
</target>
-
</project>
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 ec109b0..9de4553 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,10 +1,10 @@
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
+ 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 94f6b1d..803d1db 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,3 +1,3 @@
jptPackages = org.eclipse.jpt.common.ui \
- org.eclipse.jpt.common.ui.gen \
- org.eclipse.jpt.common.ui.jface
+ 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 42bf221..b163a8a 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,7 +1,7 @@
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
+ 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.jaxb.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.core.properties
index b82a599..6855415 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.core.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.core.properties
@@ -1,9 +1,9 @@
jptPackages = org.eclipse.jpt.jaxb.core \
- org.eclipse.jpt.jaxb.core.context \
- org.eclipse.jpt.jaxb.core.context.java \
- org.eclipse.jpt.jaxb.core.libprov \
- org.eclipse.jpt.jaxb.core.platform \
- org.eclipse.jpt.jaxb.core.resource.java \
- org.eclipse.jpt.jaxb.core.resource.jaxbindex \
- org.eclipse.jpt.jaxb.core.resource.jaxbprops \
- org.eclipse.jpt.jaxb.core.xsd
+ org.eclipse.jpt.jaxb.core.context \
+ org.eclipse.jpt.jaxb.core.context.java \
+ org.eclipse.jpt.jaxb.core.libprov \
+ org.eclipse.jpt.jaxb.core.platform \
+ org.eclipse.jpt.jaxb.core.resource.java \
+ org.eclipse.jpt.jaxb.core.resource.jaxbindex \
+ org.eclipse.jpt.jaxb.core.resource.jaxbprops \
+ org.eclipse.jpt.jaxb.core.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.eclipselink.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.eclipselink.core.properties
index 62e80bb..1feac1e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.eclipselink.core.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.eclipselink.core.properties
@@ -1,7 +1,7 @@
jptPackages = org.eclipse.jpt.jaxb.eclipselink.core \
- org.eclipse.jpt.jaxb.eclipselink.core.context \
- org.eclipse.jpt.jaxb.eclipselink.core.context.java \
- org.eclipse.jpt.jaxb.eclipselink.core.context.oxm \
- org.eclipse.jpt.jaxb.eclipselink.core.resource.java \
- org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm \
- org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util
+ org.eclipse.jpt.jaxb.eclipselink.core.context \
+ org.eclipse.jpt.jaxb.eclipselink.core.context.java \
+ org.eclipse.jpt.jaxb.eclipselink.core.context.oxm \
+ org.eclipse.jpt.jaxb.eclipselink.core.resource.java \
+ org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm \
+ org.eclipse.jpt.jaxb.eclipselink.core.resource.oxm.util
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.ui.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.ui.properties
index 33b7ed2..c477f23 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jaxb.ui.properties
@@ -1,2 +1,2 @@
jptPackages = org.eclipse.jpt.jaxb.ui.navigator \
- org.eclipse.jpt.jaxb.ui.platform
+ org.eclipse.jpt.jaxb.ui.platform
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
index 8563a60..5a8b8e7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.core.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.core.properties
@@ -1,23 +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
+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.eclipselink.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.eclipselink.core.properties
index a649de3..4db41ff 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.eclipselink.core.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.eclipselink.core.properties
@@ -1,17 +1,17 @@
jptPackages = org.eclipse.jpt.jpa.eclipselink.core \
- org.eclipse.jpt.jpa.eclipselink.core.builder \
- org.eclipse.jpt.jpa.eclipselink.core.context \
- org.eclipse.jpt.jpa.eclipselink.core.context.java \
- org.eclipse.jpt.jpa.eclipselink.core.context.orm \
- org.eclipse.jpt.jpa.eclipselink.core.context.persistence \
- org.eclipse.jpt.jpa.eclipselink.core.jpql.spi \
- org.eclipse.jpt.jpa.eclipselink.core.platform \
- org.eclipse.jpt.jpa.eclipselink.core.resource.java \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3 \
- org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4
+ org.eclipse.jpt.jpa.eclipselink.core.builder \
+ org.eclipse.jpt.jpa.eclipselink.core.context \
+ org.eclipse.jpt.jpa.eclipselink.core.context.java \
+ org.eclipse.jpt.jpa.eclipselink.core.context.orm \
+ org.eclipse.jpt.jpa.eclipselink.core.context.persistence \
+ org.eclipse.jpt.jpa.eclipselink.core.jpql.spi \
+ org.eclipse.jpt.jpa.eclipselink.core.platform \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.java \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3 \
+ org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4
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
index e88c0f3..0212770 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.jpa.ui.properties
@@ -1,8 +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
+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.template b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.template
index 5866f35..161681f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.template
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.template
@@ -1,3 +1,4 @@
+-quiet
-charset "utf-8"
-sourcepath "@jptsourcepath@"
-classpath @rt@;@jptrt@;@wtprt@
