tutorials

6 files changed, 21 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
index cbbfc6cce3..fb7129537a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
@@ -25,13 +25,7 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.cdo.server.objectivity;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.cdo.server.ocl;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.team;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.ui.efs;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.ui.ide;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.ui.location;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.ui.workspace;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.workspace;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.workspace.efs;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport
+ org.eclipse.emf.cdo.ui.ide;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport
 Export-Package: org.eclipse.emf.cdo.doc.connectors;version="4.1.0",
  org.eclipse.emf.cdo.doc.sessions;version="4.1.0"
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml
index 5f36fc8671..70c76750ce 100644
--- a/plugins/org.eclipse.emf.cdo.doc/build.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/build.xml
@@ -13,7 +13,7 @@
 	<property file="${javadoc.project}/plugin.properties" />
 	<property name="javadoc.name" value="${pluginName}" />
 	<property name="destdir" value="${javadoc.project}/javadoc" />
-	<property name="additional.code" value="/develop/bin/javadoc" />
+	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 
 	<path id="javadoc.classpath">
 		<fileset dir="_target/plugins">
@@ -26,11 +26,11 @@
 		<dirset dir="plugins">
 			<include name="*/bin" />
 		</dirset>
-		<fileset dir="${additional.code}">
+		<fileset dir="${supplemental}">
 			<include name="*.jar" />
 		</fileset>
-		<dirset dir="${additional.code}">
-			<include name="DOCS/bin" />
+		<dirset dir="${supplemental}">
+			<include name="bin" />
 		</dirset>
 	</path>
 
@@ -69,7 +69,7 @@
 		         failonerror="true">
 
 			<doclet name="org.jboss.apiviz.APIviz"
-			        path="${additional.code}/DOCS/bin;${additional.code}/jdepend-2.9.1.jar">
+			        path="${supplemental}/bin">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<param name="-warningsfile" value="${warningsfile}" />
diff --git a/plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF
index 72d4ad2a89..41e0c7c3db 100644
--- a/plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.net4j.util.doc;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.net4j.db.db2;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db.derby;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db.hsqldb;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
diff --git a/plugins/org.eclipse.net4j.db.doc/build.xml b/plugins/org.eclipse.net4j.db.doc/build.xml
index 3028512ac2..1ffcc14139 100644
--- a/plugins/org.eclipse.net4j.db.doc/build.xml
+++ b/plugins/org.eclipse.net4j.db.doc/build.xml
@@ -13,7 +13,7 @@
 	<property file="${javadoc.project}/plugin.properties" />
 	<property name="javadoc.name" value="${pluginName}" />
 	<property name="destdir" value="${javadoc.project}/javadoc" />
-	<property name="additional.code" value="/develop/bin/javadoc" />
+	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 
 	<path id="javadoc.classpath">
 		<fileset dir="_target/plugins">
@@ -26,11 +26,11 @@
 		<dirset dir="plugins">
 			<include name="*/bin" />
 		</dirset>
-		<fileset dir="${additional.code}">
+		<fileset dir="${supplemental}">
 			<include name="*.jar" />
 		</fileset>
-		<dirset dir="${additional.code}">
-			<include name="DOCS/bin" />
+		<dirset dir="${supplemental}">
+			<include name="bin" />
 		</dirset>
 	</path>
 
@@ -69,7 +69,7 @@
 		         failonerror="true">
 
 			<doclet name="org.jboss.apiviz.APIviz"
-			        path="${additional.code}/DOCS/bin;${additional.code}/jdepend-2.9.1.jar">
+			        path="${supplemental}/bin">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<param name="-warningsfile" value="${warningsfile}" />
diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml
index ee613771af..3b20c79b57 100644
--- a/plugins/org.eclipse.net4j.doc/build.xml
+++ b/plugins/org.eclipse.net4j.doc/build.xml
@@ -13,7 +13,7 @@
 	<property file="${javadoc.project}/plugin.properties" />
 	<property name="javadoc.name" value="${pluginName}" />
 	<property name="destdir" value="${javadoc.project}/javadoc" />
-	<property name="additional.code" value="/develop/bin/javadoc" />
+	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 
 	<path id="javadoc.classpath">
 		<fileset dir="_target/plugins">
@@ -26,11 +26,11 @@
 		<dirset dir="plugins">
 			<include name="*/bin" />
 		</dirset>
-		<fileset dir="${additional.code}">
+		<fileset dir="${supplemental}">
 			<include name="*.jar" />
 		</fileset>
-		<dirset dir="${additional.code}">
-			<include name="DOCS/bin" />
+		<dirset dir="${supplemental}">
+			<include name="bin" />
 		</dirset>
 	</path>
 
@@ -69,7 +69,7 @@
 		         failonerror="true">
 
 			<doclet name="org.jboss.apiviz.APIviz"
-			        path="${additional.code}/DOCS/bin;${additional.code}/jdepend-2.9.1.jar">
+			        path="${supplemental}/bin">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<param name="-warningsfile" value="${warningsfile}" />
diff --git a/plugins/org.eclipse.net4j.util.doc/build.xml b/plugins/org.eclipse.net4j.util.doc/build.xml
index f165b29939..c297da86a7 100644
--- a/plugins/org.eclipse.net4j.util.doc/build.xml
+++ b/plugins/org.eclipse.net4j.util.doc/build.xml
@@ -13,7 +13,7 @@
 	<property file="${javadoc.project}/plugin.properties" />
 	<property name="javadoc.name" value="${pluginName}" />
 	<property name="destdir" value="${javadoc.project}/javadoc" />
-	<property name="additional.code" value="/develop/bin/javadoc" />
+	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 
 	<path id="javadoc.classpath">
 		<fileset dir="_target/plugins">
@@ -26,11 +26,11 @@
 		<dirset dir="plugins">
 			<include name="*/bin" />
 		</dirset>
-		<fileset dir="${additional.code}">
+		<fileset dir="${supplemental}">
 			<include name="*.jar" />
 		</fileset>
-		<dirset dir="${additional.code}">
-			<include name="DOCS/bin" />
+		<dirset dir="${supplemental}">
+			<include name="bin" />
 		</dirset>
 	</path>
 
@@ -69,7 +69,7 @@
 		         failonerror="true">
 
 			<doclet name="org.jboss.apiviz.APIviz"
-			        path="${additional.code}/DOCS/bin;${additional.code}/jdepend-2.9.1.jar">
+			        path="${supplemental}/bin">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<param name="-warningsfile" value="${warningsfile}" />