Merge branch 'refs/heads/master' of ssh://jvonpilgrim@git.eclipse.org/gitroot/gef3d/org.eclipse.gef3d.git
diff --git a/doc/org.eclipse.gef3d.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.gef3d.doc/META-INF/MANIFEST.MF
index 19b913f..0d50a63 100644
--- a/doc/org.eclipse.gef3d.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.gef3d.doc/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF3D Documentation
 Bundle-SymbolicName: org.eclipse.gef3d.doc;singleton:=true
-Bundle-Version: 0.8.1
+Bundle-Version: 0.8.1.qualifier
 Bundle-Vendor: Eclipse.org
diff --git a/doc/org.eclipse.gef3d.doc/buildjavadoc.xml b/doc/org.eclipse.gef3d.doc/buildjavadoc.xml
index d1ccfa2..6f682dc 100644
--- a/doc/org.eclipse.gef3d.doc/buildjavadoc.xml
+++ b/doc/org.eclipse.gef3d.doc/buildjavadoc.xml
@@ -12,6 +12,9 @@
  	****************************************************************************
 -->
 
+<!-- 
+    THIS BUILD SCRIPT IS NO LONGER USED, INSTEAD, TYCHO/MAVEN IS CREATING THE DOCUMENTATION
+-->
 
 <!---
 	Build script for Ant, generate JavaDoc for _all_ Gef3D projects.
diff --git a/doc/org.eclipse.gef3d.doc/plugin.xml b/doc/org.eclipse.gef3d.doc/plugin.xml
index c0e3d56..1cd5058 100644
--- a/doc/org.eclipse.gef3d.doc/plugin.xml
+++ b/doc/org.eclipse.gef3d.doc/plugin.xml
@@ -10,16 +10,23 @@
  <!--  Define Javadoc locations       --> 
  <!--  =============================  --> 
  <extension point="org.eclipse.pde.core.javadoc">
-     <javadoc path="references/javadoc/" archive="false">
+     <javadoc path="reference/api/" archive="false">
+        <plugin id="org.eclipse.draw3d"/>
+        <plugin id="org.eclipse.draw3d.geometry"/>
+        <plugin id="org.eclipse.draw3d.graphics3d"/>
+    <!--    <plugin id="org.eclipse.draw3d.jogl"/> -->
+        <plugin id="org.eclipse.draw3d.lwjgl"/>
+        <plugin id="org.eclipse.draw3d.ui"/>
         <plugin id="org.eclipse.gef3d"/>
         <plugin id="org.eclipse.gef3d.ext"/>
-        <plugin id="org.eclipse.draw3d"/>
-        <plugin id="org.eclipse.gefports"/>
+        <plugin id="org.eclipse.gef3d.ext.emf"/>
         <plugin id="org.eclipse.gef3d.gmf"/>
+        <plugin id="org.eclipse.gef3d.examples.ecore"/>
         <plugin id="org.eclipse.gef3d.examples.graph"/>
      </javadoc>
   </extension>
   
 
 
+
 </plugin>
diff --git a/doc/org.eclipse.gef3d.doc/pom.xml b/doc/org.eclipse.gef3d.doc/pom.xml
index 9f528eb..76df96f 100644
--- a/doc/org.eclipse.gef3d.doc/pom.xml
+++ b/doc/org.eclipse.gef3d.doc/pom.xml
@@ -11,17 +11,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">	
     <modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.gef3d.examples</groupId>
-	<artifactId>org.eclipse.gef3d.examples.graph</artifactId>
+	<groupId>org.eclipse.gef3d.doc</groupId>
+	<artifactId>org.eclipse.gef3d.doc</artifactId>
 	<version>0.8.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<parent>
 		<groupId>org.eclipse.gef3d</groupId>
-		<artifactId>examples</artifactId>
+		<artifactId>doc</artifactId>
 		<version>0.8.1-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	
 	
+
 </project>
\ No newline at end of file
diff --git a/doc/org.eclipse.gef3d.doc/toc.xml b/doc/org.eclipse.gef3d.doc/toc.xml
index 7ec67ed..b8f671b 100644
--- a/doc/org.eclipse.gef3d.doc/toc.xml
+++ b/doc/org.eclipse.gef3d.doc/toc.xml
@@ -26,7 +26,7 @@
 	</topic>
 
 	<topic label="Reference">
-		<topic label="API Reference" href="references/javadoc/index.html" />
+		<topic label="API Reference" href="reference/api/index.html" />
 		
 	<!--
 	    <link toc="topics_Reference.xml"/>
diff --git a/features/org.eclipse.gef3d.feature.sdk/feature.xml b/features/org.eclipse.gef3d.feature.sdk/feature.xml
index fb71779..8c22035 100644
--- a/features/org.eclipse.gef3d.feature.sdk/feature.xml
+++ b/features/org.eclipse.gef3d.feature.sdk/feature.xml
@@ -183,13 +183,11 @@
          version="0.0.0"
          unpack="false"/>
          
-         
-<!--
    <plugin
          id="org.eclipse.gef3d.doc"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
--->
+
 </feature>
diff --git a/pom.xml b/pom.xml
index a34e36a..d6acbd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,19 +26,18 @@
 
     <properties>
 		<tycho-version>0.13.0</tycho-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.build.encoding>UTF-8</project.build.encoding>
 	</properties>
 
 
 	<modules>
 		<module>plugins</module>
 		<module>examples</module>		
+		<module>doc</module>
 		<module>features</module>
 		<module>repository</module>
-		<!--
-
-		<module>doc</module>
-		<module>tests</module>
-		-->
+	<!--	<module>tests</module> -->
 	</modules>
 
 	<mailingLists>
@@ -141,31 +140,19 @@
 	</build>
 	
 	<repositories>
-					<repository>
-					<id>Galileo</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/galileo</url>
-				</repository>				
-<!--
-				<repository>
-					<id>Helios</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/helios</url>
-				</repository>				
-	
--->
-
-<repository>
-				<id>lwjgl.org</id>
-				<layout>p2</layout>
-				<url>file:/Users/jpilgrim/Desktop/x/LWJGL/eclipse-update/org.lwjgl.build/build/plugins/org.lwjgl.updatesite</url>
-			</repository>	
-		</repositories>
+        <!-- eclipse repositories defined in profiles -->
+        <repository>
+            <id>lwjgl.org</id>
+            <layout>p2</layout>
+            <url>http://jevopi.de/updatesite/org.lwjgl.updatesite</url>
+        </repository>	
+    </repositories>
+		
 	<profiles>
     	<profile>
 			<id>galileo</id>
 			<activation>
-				<activeByDefault>false</activeByDefault>
+				<activeByDefault>true</activeByDefault>
 			</activation>
 			<repositories>
 				<repository>
@@ -188,7 +175,50 @@
 				</repository>				
 			</repositories>
 		</profile>
-		
+
+		<profile>
+			<id>javadoc</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<!--
+					   TODO: 
+					       1) define this in doc plugin? also see discussion in tycho-user mailing list
+					       2) do not generate in doc directly, but instead in target somehow
+					       3) ignore test classes
+					       4) maybe build has to be executed twice
+                    -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.8</version>
+						<configuration>
+							<minmemory>128m</minmemory>
+		          			<maxmemory>1g</maxmemory>
+						</configuration>
+						<executions>
+							<execution>
+								<id>aggregate</id>
+								<goals>
+									<goal>aggregate</goal>
+								</goals>
+								<phase>generate-resources</phase>
+								<configuration>
+									<minmemory>128m</minmemory>
+		          					<maxmemory>1024m</maxmemory>
+		          					<reportOutputDirectory>doc/org.eclipse.gef3d.doc/reference</reportOutputDirectory>
+		          					<destDir>api</destDir>
+									<excludePackageNames>*.internal:*.internal.*:*.tests:*.tests.*:*.examples:*.examples.*</excludePackageNames>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 	</profiles>
 
 </project>
\ No newline at end of file
diff --git a/repository/pom.xml b/repository/pom.xml
index 422bba6..d80a38a 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -13,7 +13,8 @@
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.gef3d.repository</groupId>
 	<artifactId>repository</artifactId>
-	<version>0.8.1-SNAPSHOT</version>	<packaging>eclipse-repository</packaging>
+	<version>0.8.1-SNAPSHOT</version>	
+	<packaging>eclipse-repository</packaging>
 
 	<parent>
 		<groupId>org.eclipse.gef3d</groupId>