refactored the maven project structure so that things are in a simpler tree...

refactored the maven project structure so that things are in a simpler tree structure to avoid folks getting lost

libraries/apidoc/pom.xml → libraries/docs/apidoc/pom.xml

@@ -6,8 +6,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <groupId>org.jetbrains.kotlin.docs</groupId>
+        <artifactId>docs</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -34,10 +34,10 @@
               <version>${project.version}</version>
               <configuration>
                   <sources>
-                      <source>${basedir}/../stdlib/src</source>
-                      <source>${basedir}/../kunit/src/main/kotlin</source>
-                      <source>${basedir}/../kotlin-jdbc/src/main/kotlin</source>
-                      <source>${basedir}/../kotlin-swing/src/main/kotlin</source>
+                      <source>${basedir}/../../stdlib/src</source>
+                      <source>${basedir}/../../kunit/src/main/kotlin</source>
+                      <source>${basedir}/../../kotlin-jdbc/src/main/kotlin</source>
+                      <source>${basedir}/../../kotlin-swing/src/main/kotlin</source>
                   </sources>
                   <title>Kotlin API (${project.version})</title>
                   <ignorePackages>

libraries/docs/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.jetbrains.kotlin.docs</groupId>
+    <artifactId>docs</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project-root>${project.basedir}/../..</project-root>
+    </properties>
+
+    <modules>
+        <module>apidoc</module>
+        <module>website</module>
+    </modules>
+</project>

libraries/website/pom.xml → libraries/docs/website/pom.xml

@@ -6,8 +6,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <groupId>org.jetbrains.kotlin.docs</groupId>
+        <artifactId>docs</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -24,26 +24,6 @@
             <artifactId>pegdown</artifactId>
             <version>${pegdown.version}</version>
         </dependency>
-        <!-- add the kdoc dependency for generating kdoc -->
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kdoc</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- TODO not sure why we have to list transitive dependendcies on compiler... -->
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-util</artifactId>
-            <version>3.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>3.3</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt → libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt

 package org.jetbrains.kotlin.site
 
+import kotlin.test.*
 import junit.framework.TestCase
 import java.io.File
-import org.jetbrains.kotlin.doc.KDocArguments
-import org.jetbrains.kotlin.doc.KDocCompiler
 
 class GenerateSiteTest : TestCase() {
     val srcDir = findTemplateDir()
@@ -17,6 +16,20 @@ class GenerateSiteTest : TestCase() {
         generator.run()
     }
 
+    fun testCopyApiDocs(): Unit {
+        val outDir = File(siteOutputDir, "versions/$versionDir/apidocs")
+        println("Generating library KDocs to $outDir")
+
+        copyDocResources(outDir)
+
+        val apidocDir = File(siteOutputDir, "../../../apidoc/target/site/apidocs")
+        assertTrue(apidocDir.exists(), "Directory does not exist ${apidocDir.getCanonicalPath()}")
+
+
+        copyRecursive(apidocDir, outDir)
+    }
+
+    /*
     fun testGenerateStdlibKDoc(): Unit {
         val outDir = File(siteOutputDir, "versions/$versionDir/apidocs")
         println("Generating library KDocs to $outDir")
@@ -64,9 +77,16 @@ class GenerateSiteTest : TestCase() {
         val compiler = KDocCompiler()
         compiler.exec(System.out, args)
     }
+    */
 
     fun copyDocResources(outDir: File): Unit {
         val sourceDir = File(srcDir, "../apidocs")
+        copyRecursive(sourceDir, outDir)
+    }
+
+
+    // TODO this would make a handy extension function on File :)
+    fun copyRecursive(sourceDir: File, outDir: File): Unit {
         sourceDir.recurse {
             if (it.isFile()) {
                 var relativePath = sourceDir.relativePath(it)
@@ -77,7 +97,6 @@ class GenerateSiteTest : TestCase() {
         }
     }
 
-
     fun findTemplateDir(): File {
         val path = "src/main/templates"
         for (p in arrayList(".", "website", "library/website")) {

libraries/kotlin-java/pom.xml → libraries/examples/kotlin-java-example/pom.xml

@@ -11,7 +11,10 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kotlin-java</artifactId>
+    <artifactId>kotlin-java-example</artifactId>
+
+    <description>This example shows how the standard kotlin API can be easily used from Java code;
+        its maybe more verbose and not as kool, but still very functional</description>
 
     <dependencies>
         <dependency>

libraries/examples/pom.xml

@@ -20,6 +20,7 @@
     </properties>
 
     <modules>
+        <module>kotlin-java-example</module>
         <module>js-example</module>
     </modules>
 </project>

libraries/pom.xml

@@ -29,18 +29,14 @@
     </properties>
 
     <modules>
-        <module>kotlin-install</module>
-        <module>runtime</module>
-        <module>kotlin-maven-plugin</module>
-        <module>kdoc-maven-plugin</module>
+        <module>tools</module>
+
         <module>kunit</module>
         <module>stdlib</module>
-        <module>kdoc</module>
         <module>kotlin-jdbc</module>
-        <module>kotlin-java</module>
         <module>kotlin-swing</module>
-        <module>website</module>
-        <module>apidoc</module>
+
+        <module>docs</module>
         <module>examples</module>
     </modules>
 

libraries/kdoc-maven-plugin/pom.xml → libraries/tools/kdoc-maven-plugin/pom.xml

@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <artifactId>tools</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

libraries/kdoc/pom.xml → libraries/tools/kdoc/pom.xml

@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <artifactId>tools</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

libraries/kotlin-install/pom.xml → libraries/tools/kotlin-install/pom.xml

@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <artifactId>tools</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

libraries/kotlin-maven-plugin/pom.xml → libraries/tools/kotlin-maven-plugin/pom.xml

@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <artifactId>tools</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

libraries/tools/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>tools</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project-root>${project.basedir}/../..</project-root>
+    </properties>
+
+    <modules>
+        <module>kotlin-install</module>
+        <module>runtime</module>
+        <module>kotlin-maven-plugin</module>
+        <module>kdoc</module>
+        <module>kdoc-maven-plugin</module>
+    </modules>
+</project>

libraries/runtime/pom.xml → libraries/tools/runtime/pom.xml

@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
+        <artifactId>tools</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>