From 779a56b50be9fbb4c06276b679776f62d15ca9c5 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Sat, 7 Jan 2012 14:15:32 +0100
Subject: Adjust doc generator to Git

---
 plugins/org.eclipse.emf.cdo.releng.doc/build.xml   |  9 ++++++---
 .../buildTemplate.ant                              | 21 ++++++++++++++------
 .../debug/org.eclipse.emf.cdo.doc.warnings         | 23 +---------------------
 .../debug/org.eclipse.net4j.db.doc.warnings        |  6 +++---
 .../debug/org.eclipse.net4j.util.doc.warnings      |  4 ++--
 5 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/build.xml b/plugins/org.eclipse.emf.cdo.releng.doc/build.xml
index 0420bfb7bd..f59d77c9d3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/build.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0"?>
 <project name="JavaDoc" default="build" basedir="../..">
 
+	<property file="${user.home}/org.eclipse.emf.cdo.releng.doc_4.1.properties" />
+	<property name="path.tp" value=".target" />
+	<property name="path.supplemental" value="${user.home}/git/local/org.eclipse.emf.cdo.releng.doc.supplemental" />
+		
 	<property name="releng.project" value="plugins/org.eclipse.emf.cdo.releng.doc" />
-	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 
 	<target name="assemble.scripts">
 		<java classname="org.eclipse.emf.cdo.releng.doc.AssembleScripts" failonerror="true">
 			<classpath path="${releng.project}/bin" />
-			<classpath path="${supplemental}/tools.jar" />
+			<classpath path="${path.supplemental}/tools.jar" />
 			<classpath>
-				<fileset dir="_target/plugins">
+				<fileset dir="${path.tp}/plugins">
 					<include name="**/*.jar" />
 				</fileset>
 			</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
index b95e85b433..866ede2208 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
@@ -3,6 +3,10 @@
 
 	<!-- GENERATION WARNING -->
 
+	<property file="${user.home}/org.eclipse.emf.cdo.releng.doc_4.1.properties" />
+	<property name="path.tp" value=".target" />
+	<property name="path.supplemental" value="${user.home}/git/local/org.eclipse.emf.cdo.releng.doc.supplemental" />
+
 	<property name="jdk.link" value="http://download.oracle.com/javase/1.5.0/docs/api" />
 	<property name="platform.link"
 	          value="http://help.eclipse.org/juno/topic/org.eclipse.platform.doc.isv/reference/api" />
@@ -16,12 +20,11 @@
 	<property name="schemadoc.destdir" value="${project.path}/schemadoc" />
 	<property name="article.destdir" value="${project.path}/html" />
 	<property name="article.sources" value="${project.path}/src" />
-	<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
 	<!-- SCHEMA SKIP -->
 	<!-- ARTICLE SKIP -->
 
 	<path id="javadoc.classpath">
-		<fileset dir="_target/plugins">
+		<fileset dir="${path.tp}/plugins">
 			<include name="**/*.jar" />
 			<exclude name="**/*carbon*" />
 			<exclude name="**/*.source_*" />
@@ -33,10 +36,10 @@
 		<dirset dir="plugins">
 			<include name="*/bin" />
 		</dirset>
-		<fileset dir="${supplemental}">
+		<fileset dir="${path.supplemental}">
 			<include name="*.jar" />
 		</fileset>
-		<dirset dir="${supplemental}">
+		<dirset dir="${path.supplemental}">
 			<include name="bin" />
 		</dirset>
 	</path>
@@ -50,6 +53,8 @@
 	         classpathref="javadoc.classpath" />
 
 	<target name="build.java">
+		<echo message="Building JavaDoc for ${PROJECT-NAME}" />
+		
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset dir="${javadoc.destdir}" defaultexcludes="true">
 				<include name="**/*" />
@@ -77,7 +82,7 @@
 		         overview="${project.path}/overview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
-			<doclet name="org.jboss.apiviz.APIviz" path="${supplemental}/bin">
+			<doclet name="org.jboss.apiviz.APIviz" path="${path.supplemental}/bin">
 				<param name="-nopackagediagram" />
 				<param name="-nosubtypes" />
 				<param name="-warningsfile" value="${warningsfile}" />
@@ -170,6 +175,8 @@
 	</target>
 
 	<target name="build.schema" unless="schema.skip">
+		<echo message="Building SchemaDoc for ${PROJECT-NAME}" />
+		
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset dir="${schemadoc.destdir}" defaultexcludes="true">
 				<include name="**/*" />
@@ -193,6 +200,8 @@
 	</target>
 
 	<target name="build.article" unless="article.skip">
+		<echo message="Building Articles for ${PROJECT-NAME}" />
+		
 		<tstamp>
 			<format property="start.time" pattern="y-M-D-H-m-s-S" />
 		</tstamp>
@@ -223,7 +232,7 @@
 		         private="true">
 
 			<doclet name="org.eclipse.emf.cdo.releng.doc.article.impl.ArticleDoclet"
-			        path="plugins/org.eclipse.emf.cdo.releng.doc/bin;${supplemental}/bin;${supplemental}/org.eclipse.emf.ecore_2.7.0.v20110605-0747.jar;${supplemental}/org.eclipse.emf.ecore.xmi_2.7.0.v20110520-1406.jar;${supplemental}/org.eclipse.emf.common_2.7.0.v20110605-0747.jar;${supplemental}/dom4j-1.6.1.jar;${supplemental}/poi-3.8-beta4-20110826.jar;${supplemental}/poi-ooxml-3.8-beta4-20110826.jar;${supplemental}/poi-ooxml-schemas-3.8-beta4-20110826.jar;${supplemental}/xmlbeans-2.3.0.jar">
+			        path="plugins/org.eclipse.emf.cdo.releng.doc/bin;${path.supplemental}/bin;${path.supplemental}/org.eclipse.emf.ecore_2.7.0.v20110605-0747.jar;${path.supplemental}/org.eclipse.emf.ecore.xmi_2.7.0.v20110520-1406.jar;${path.supplemental}/org.eclipse.emf.common_2.7.0.v20110605-0747.jar;${path.supplemental}/dom4j-1.6.1.jar;${path.supplemental}/poi-3.8-beta4-20110826.jar;${path.supplemental}/poi-ooxml-3.8-beta4-20110826.jar;${path.supplemental}/poi-ooxml-schemas-3.8-beta4-20110826.jar;${path.supplemental}/xmlbeans-2.3.0.jar">
 				<param name="-starttime" value="${start.time}" />
 				<param name="-basefolder" value="${basedir}" />
 				<param name="-project" value="${PROJECT-NAME}" />
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.emf.cdo.doc.warnings b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.emf.cdo.doc.warnings
index 63dc266ae8..4aa0b2bedb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.emf.cdo.doc.warnings
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.emf.cdo.doc.warnings
@@ -8,7 +8,7 @@ Class description missing: org.eclipse.emf.cdo.server.db.IMetaDataManager.class(
 Class description missing: org.eclipse.emf.cdo.server.db.IPreparedStatementCache.class(IPreparedStatementCache.java:23)
 Class description missing: org.eclipse.emf.cdo.server.db4o.IDB4OIdentifiableObject.class(IDB4OIdentifiableObject.java:18)
 Class description missing: org.eclipse.emf.cdo.server.db4o.IDB4OStore.class(IDB4OStore.java:21)
-Class description missing: org.eclipse.emf.cdo.server.hibernate.CDOHibernateUtil.class(CDOHibernateUtil.java:20)
+Class description missing: org.eclipse.emf.cdo.server.hibernate.CDOHibernateUtil.class(CDOHibernateUtil.java:21)
 Class description missing: org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider$Factory.class(IHibernateMappingProvider.java:38)
 Class description missing: org.eclipse.emf.cdo.server.hibernate.IHibernateStore.class(IHibernateStore.java:27)
 Class description missing: org.eclipse.emf.cdo.server.hibernate.IHibernateStoreAccessor.class(IHibernateStoreAccessor.java:25)
@@ -37,24 +37,3 @@ Class description missing: org.eclipse.emf.cdo.server.ocl.CDOExtentMap.class(CDO
 Class description missing: org.eclipse.emf.cdo.server.ocl.OCLExtentCreator.class(OCLExtentCreator.java:22)
 Class description missing: org.eclipse.emf.cdo.server.ocl.OCLQueryHandler$Factory.class(OCLQueryHandler.java:369)
 Class description missing: org.eclipse.emf.cdo.server.ocl.OCLQueryHandler.class(OCLQueryHandler.java:70)
-Class description missing: org.eclipse.emf.cdo.ui.CDOEditorInput.class(CDOEditorInput.java:22)
-Class description missing: org.eclipse.emf.cdo.ui.CDOEventHandler.class(CDOEventHandler.java:46)
-Class description missing: org.eclipse.emf.cdo.ui.CDOInteractiveExceptionHandler$ExceptionDialog.class(CDOInteractiveExceptionHandler.java:124)
-Class description missing: org.eclipse.emf.cdo.ui.CDOInteractiveExceptionHandler.class(CDOInteractiveExceptionHandler.java:41)
-Class description missing: org.eclipse.emf.cdo.ui.CDOItemProvider.class(CDOItemProvider.java:84)
-Class description missing: org.eclipse.emf.cdo.ui.CDOLabelProvider.class(CDOLabelProvider.java:33)
-Class description missing: org.eclipse.emf.cdo.ui.ide.CommonNavigatorUtils$MessageType.class(CommonNavigatorUtils.java:109)
-Class description missing: org.eclipse.emf.cdo.ui.ide.CommonNavigatorUtils.class(CommonNavigatorUtils.java:27)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node$BranchNode.class(Node.java:77)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node$PackagesNode.class(Node.java:144)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node$ResourcesNode.class(Node.java:195)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node$SessionsNode.class(Node.java:252)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node$Type.class(Node.java:69)
-Class description missing: org.eclipse.emf.cdo.ui.ide.Node.class(Node.java:34)
-Class description missing: org.eclipse.emf.cdo.ui.ide.RepositoryContentProvider.class(RepositoryContentProvider.java:79)
-Class description missing: org.eclipse.emf.cdo.ui.ide.RepositoryLabelProvider.class(RepositoryLabelProvider.java:30)
-Class description missing: org.eclipse.emf.cdo.ui.widgets.AuditScale.class(AuditScale.java:28)
-Class description missing: org.eclipse.emf.cdo.ui.widgets.ComposeBranchPointComposite.class(ComposeBranchPointComposite.java:28)
-Class description missing: org.eclipse.emf.cdo.ui.widgets.SelectBranchComposite.class(SelectBranchComposite.java:43)
-Class description missing: org.eclipse.emf.cdo.ui.widgets.SelectTimeStampComposite.class(SelectTimeStampComposite.java:46)
-Class description missing: org.eclipse.emf.cdo.ui.widgets.SessionComposite.class(SessionComposite.java:43)
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.db.doc.warnings b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.db.doc.warnings
index b0db644f5d..29c6e5b5cb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.db.doc.warnings
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.db.doc.warnings
@@ -1,6 +1,6 @@
-Class description missing: org.eclipse.net4j.db.DBUtil$DeserializeRowHandler.class(DBUtil.java:1063)
-Class description missing: org.eclipse.net4j.db.DBUtil$RowHandler.class(DBUtil.java:1044)
-Class description missing: org.eclipse.net4j.db.DBUtil$SerializeRowHandler.class(DBUtil.java:1053)
+Class description missing: org.eclipse.net4j.db.DBUtil$DeserializeRowHandler.class(DBUtil.java:1075)
+Class description missing: org.eclipse.net4j.db.DBUtil$RowHandler.class(DBUtil.java:1056)
+Class description missing: org.eclipse.net4j.db.DBUtil$SerializeRowHandler.class(DBUtil.java:1065)
 Class description missing: org.eclipse.net4j.db.derby.DerbyAdapter.class(DerbyAdapter.java:21)
 Class description missing: org.eclipse.net4j.db.derby.EmbeddedDerbyAdapter.class(EmbeddedDerbyAdapter.java:24)
 Class description missing: org.eclipse.net4j.db.h2.H2Adapter.class(H2Adapter.java:27)
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.util.doc.warnings b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.util.doc.warnings
index a1a6ca1351..e5ee1211c2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.util.doc.warnings
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/debug/org.eclipse.net4j.util.doc.warnings
@@ -70,7 +70,7 @@ Class description missing: org.eclipse.net4j.util.concurrent.Worker$WorkContext.
 Class description missing: org.eclipse.net4j.util.concurrent.Worker.class(Worker.java:26)
 Class description missing: org.eclipse.net4j.util.container.IContainer$Modifiable.class(IContainer.java:41)
 Class description missing: org.eclipse.net4j.util.container.delegate.IContainerBlockingQueue.class(IContainerBlockingQueue.java:18)
-Class description missing: org.eclipse.net4j.util.fsm.FiniteStateMachine$StateChangedEvent.class(FiniteStateMachine.java:315)
+Class description missing: org.eclipse.net4j.util.fsm.FiniteStateMachine$StateChangedEvent.class(FiniteStateMachine.java:355)
 Class description missing: org.eclipse.net4j.util.io.AsyncOutputStream.class(AsyncOutputStream.java:26)
 Class description missing: org.eclipse.net4j.util.io.AsyncWriter.class(AsyncWriter.java:26)
 Class description missing: org.eclipse.net4j.util.io.CachedFileMap.class(CachedFileMap.java:20)
@@ -234,7 +234,7 @@ Class description missing: org.eclipse.net4j.util.ui.DefaultPropertySource.class
 Class description missing: org.eclipse.net4j.util.ui.DelegatingContentProvider.class(DelegatingContentProvider.java:19)
 Class description missing: org.eclipse.net4j.util.ui.StaticContentProvider.class(StaticContentProvider.java:18)
 Class description missing: org.eclipse.net4j.util.ui.StructuredContentProvider.class(StructuredContentProvider.java:30)
-Class description missing: org.eclipse.net4j.util.ui.UIActivator$WithState.class(UIActivator.java:128)
+Class description missing: org.eclipse.net4j.util.ui.UIActivator$WithState.class(UIActivator.java:134)
 Class description missing: org.eclipse.net4j.util.ui.UIActivator.class(UIActivator.java:26)
 Class description missing: org.eclipse.net4j.util.ui.UIQueueRunner.class(UIQueueRunner.java:21)
 Class description missing: org.eclipse.net4j.util.ui.UIUtil.class(UIUtil.java:48)
-- 
cgit v1.2.3