refactored the directory structure so you can use the kool-template-s…

…ample without requiring java7 or javafx
azhong · Jul 6, 2012 · bbf6bdf · bbf6bdf
1 parent 2ff80da
commit bbf6bdf
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/javafx/kool-javafx/pom.xml → kool-javafx/pom.xml b/javafx/kool-javafx/pom.xml → kool-javafx/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>io.kool</groupId>
-        <artifactId>javafx</artifactId>
+        <artifactId>kool-project</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...fx/src/main/kotlin/io/kool/javafx/Main.kt → ...fx/src/main/kotlin/io/kool/javafx/Main.kt b/...fx/src/main/kotlin/io/kool/javafx/Main.kt → ...fx/src/main/kotlin/io/kool/javafx/Main.kt
diff --git a/...n/kotlin/io/kool/javafx/WebApplication.kt → ...n/kotlin/io/kool/javafx/WebApplication.kt b/...n/kotlin/io/kool/javafx/WebApplication.kt → ...n/kotlin/io/kool/javafx/WebApplication.kt
diff --git a/pom.xml b/pom.xml
@@ -71,6 +71,7 @@
         <module>kool-html-modelgen</module>
         <module>kool-js-library</module>
         <module>kool-ui</module>
+        <module>samples</module>
         <module>apidoc</module>
         <module>website</module>
     </modules>
@@ -135,7 +136,7 @@
                 <jdk>7</jdk>
             </activation>
             <modules>
-                <module>javafx</module>
+                <module>kool-javafx</module>
             </modules>
         </profile>
     </profiles>

diff --git a/javafx/kool-javafx-sample/ReadMe.md → samples/kool-template-sample/ReadMe.md b/javafx/kool-javafx-sample/ReadMe.md → samples/kool-template-sample/ReadMe.md
diff --git a/javafx/kool-javafx-sample/pom.xml → samples/kool-template-sample/pom.xml b/javafx/kool-javafx-sample/pom.xml → samples/kool-template-sample/pom.xml
@@ -7,18 +7,13 @@
 
     <parent>
         <groupId>io.kool</groupId>
-        <artifactId>javafx</artifactId>
+        <artifactId>samples</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kool-javafx-sample</artifactId>
+    <artifactId>kool-template-sample</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>io.kool</groupId>
-            <artifactId>kool-javafx</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.kool</groupId>
             <artifactId>kool-template</artifactId>
@@ -29,6 +24,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -71,12 +67,20 @@
     </build>
 
     <profiles>
-        <!-- runs the JavaFX UI -->
+        <!-- runs the JavaFX UI - requires Java 7 -->
         <profile>
             <id>ui</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>io.kool</groupId>
+                    <artifactId>kool-javafx</artifactId>
+                    <version>${project.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
             <build>
                 <plugins>
                     <plugin>

diff --git a/javafx/kool-javafx-sample/sample.html → samples/kool-template-sample/sample.html b/javafx/kool-javafx-sample/sample.html → samples/kool-template-sample/sample.html
@@ -7,7 +7,7 @@
     <script type="text/javascript" src="src/main/js/jquery.js"></script>
     <script type="text/javascript" src="target/js/kotlin-lib-ecma3.js"></script>
     <script type="text/javascript" src="target/js/kotlin-lib.js"></script>
-    <script type="text/javascript" src="target/js/kool-javafx-sample.js"></script>
+    <script type="text/javascript" src="target/js/kool-template-sample.js"></script>
 </head>
 <body>
 <h1>Sample</h1>
@@ -19,7 +19,7 @@ <h1>Sample</h1>
 <p>Should have generated stuff above...</p>
 
 <script  type="text/javascript">
-    $(document).ready(Kotlin.modules['kool-javafx-sample'].test.kool.myapp.myApp)
+    $(document).ready(Kotlin.modules['kool-template-sample'].test.kool.myapp.myApp)
 </script>
 
 </body>

diff --git a/.../kool-javafx-sample/src/main/js/jquery.js → ...ool-template-sample/src/main/js/jquery.js b/.../kool-javafx-sample/src/main/js/jquery.js → ...ool-template-sample/src/main/js/jquery.js
diff --git a/.../src/main/kotlin/test/kool/myapp/MyApp.kt → .../src/main/kotlin/test/kool/myapp/MyApp.kt b/.../src/main/kotlin/test/kool/myapp/MyApp.kt → .../src/main/kotlin/test/kool/myapp/MyApp.kt
diff --git a/...afx-sample/src/main/resources/sample.html → ...ate-sample/src/main/resources/sample.html b/...afx-sample/src/main/resources/sample.html → ...ate-sample/src/main/resources/sample.html
diff --git a/javafx/pom.xml → samples/pom.xml b/javafx/pom.xml → samples/pom.xml
@@ -11,12 +11,11 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>javafx</artifactId>
+    <artifactId>samples</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>kool-javafx</module>
-        <module>kool-javafx-sample</module>
+        <module>kool-template-sample</module>
     </modules>
 
 </project>