Refactor namespace and include GUI

speedment · May 13, 2015 · 1eaceef · 1eaceef
1 parent 2bda58e
commit 1eaceef
Show file tree

Hide file tree

Showing 301 changed files with 4,961 additions and 819 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-Speedment ORM - An accelerated ORM
+Speedment - An accelerated database framework
 ==================================
-![Harry the Hare](http://www.speedment.com/images/Speedhare_240x205.png)
+![Spire the Hare](http://www.speedment.com/images/Speedhare_240x205.png)
 About
 -----
-The Speedment ORM accelerates your JVM based database applications and makes programming so easy!
+The Speedment accelerates your JVM based database applications and makes programming so easy!
 
 Here are a few examples of how you could use Speedment from your code:
 ### Easy initialization
@@ -111,9 +111,10 @@ When ready, you can just add the following to your project's `pom.xml` to use Sp
 ```xml
 <dependency>
     <groupId>com.speedment</groupId>
-    <artifactId>orm</artifactId>
-    <version>0.0.1</version>
+    <artifactId>speedment</artifactId>
+    <version>${speedment.version}</version>
 </dependency>
 ```
+You must also add a JDBC dependency for the database you are using.
 
 N.B. Speedment is not yet on Maven Central Repository so you can't use it in your pom yet unless you manually build and install it.
diff --git a/pom.xml b/pom.xml
@@ -20,15 +20,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>com.speedment</groupId>
-    <artifactId>orm</artifactId>
-    <version>0.0.1-rc1-SNAPSHOT</version>
+    <artifactId>speedment</artifactId>
+    <version>0.4.1-rc1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <mainClass>com.speedment.orm.gui.MainApp</mainClass>
     </properties>
-    <name>Speedment ORM</name>
+    <name>Speedment</name>
 
     <licenses>
         <license>
@@ -39,6 +40,34 @@
     </licenses>
 
 
+    <scm>
+        <connection>scm:git:git://github.com/speedment/speedment.git</connection>
+        <developerConnection>scm:git:git@github.com:speedment/speedment.git</developerConnection>
+        <url>https://github.com/speedment/speedment/</url>
+    </scm>
+    <developers>
+        <developer>
+            <id>permin</id>
+            <name>Per Ake Minborg</name>
+            <email>minborg@speedment.com</email>
+        </developer>
+        <developer>
+            <id>emifor</id>
+            <name>Emil Forslund</name>
+            <email>emil@speedment.com</email>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>Github</system>
+        <url>https://github.com/speedment/speedment/issues</url>
+    </issueManagement>
+    <organization>
+        <name>Speedment, Inc.</name>
+        <url>http://www.speedment.com/</url>
+    </organization>
+
+
     <build>
         <plugins>
             <plugin>
@@ -90,6 +119,50 @@
                 <version>2.6.0-01</version>
                 <extensions>true</extensions>
             </plugin>-->
+
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>unpack-dependencies</id>
+
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${java.home}/../bin/javafxpackager</executable>
+                            <arguments>
+                                <argument>-createjar</argument>
+                                <argument>-nocss2bin</argument>
+                                <argument>-appclass</argument>
+                                <argument>${mainClass}</argument>
+                                <argument>-srcdir</argument>
+                                <argument>${project.build.directory}/classes</argument>
+                                <argument>-outdir</argument>
+                                <argument>${project.build.directory}</argument>
+                                <argument>-outfile</argument>
+                                <argument>${project.build.finalName}.jar</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-cli</id>
+                        <goals>
+                            <goal>exec</goal>                            
+                        </goals>
+                        <configuration>
+                            <executable>${java.home}/bin/java</executable>
+                            <commandlineArgs>${runfx.args}</commandlineArgs>
+                        </configuration>
+                    </execution>
+                </executions>  
+            </plugin>
+
+
         </plugins>
     </build>
 
@@ -173,11 +246,11 @@
 
 
         <!-- GNU LICENSE, NOT INCLUDED IN THE PRODUCT! -->
-        <dependency>
+<!--        <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.34</version>
-        </dependency>
+        </dependency>-->
 
         <!-- LICENSE INFORMATION
         OpenHFT, Chronicle Map
@@ -198,6 +271,35 @@
             <version>1.7.10</version>
         </dependency>-->
 
+
+
+        <!-- LICENSE INFORMATION
+        Silk 1.3
+        Creative Commons 2.5
+        http://creativecommons.org/licenses/by/2.5/
+        2015-03-31
+        emifo
+        -->
+        <dependency>
+            <groupId>com.famfamfam</groupId>
+            <artifactId>silk</artifactId>
+            <version>1.3</version>
+        </dependency>
+
+        <!-- LICENSE INFORMATION
+        ControlFX 8.20.8
+        BSD 3-clause license
+        http://opensource.org/licenses/BSD-3-Clause
+        2015-03-31
+        emifo
+        -->
+        <dependency>
+            <groupId>org.controlsfx</groupId>
+            <artifactId>controlsfx</artifactId>
+            <version>8.20.8</version>
+        </dependency>
+
+
     </dependencies>
 
 

diff --git a/src/main/java/com/speedment/codegen/base/DefaultDependencyManager.java b/src/main/java/com/speedment/codegen/base/DefaultDependencyManager.java
@@ -20,7 +20,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 
 /**
  *

diff --git a/src/main/java/com/speedment/codegen/java/views/AnnotationUsageView.java b/src/main/java/com/speedment/codegen/java/views/AnnotationUsageView.java
@@ -18,10 +18,10 @@
 
 import com.speedment.codegen.lang.models.AnnotationUsage;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import java.util.stream.Stream;
 
 /**

diff --git a/src/main/java/com/speedment/codegen/java/views/AnnotationView.java b/src/main/java/com/speedment/codegen/java/views/AnnotationView.java
@@ -18,13 +18,13 @@
 
 import com.speedment.codegen.lang.models.Annotation;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.java.views.interfaces.HasAnnotationUsageView;
 import com.speedment.codegen.java.views.interfaces.HasJavadocView;
 import com.speedment.codegen.java.views.interfaces.HasNameView;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 
 /**
  *

diff --git a/src/main/java/com/speedment/codegen/java/views/ClassOrInterfaceView.java b/src/main/java/com/speedment/codegen/java/views/ClassOrInterfaceView.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.java.views.interfaces.HasAnnotationUsageView;

diff --git a/src/main/java/com/speedment/codegen/java/views/ClassView.java b/src/main/java/com/speedment/codegen/java/views/ClassView.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.lang.models.Class;
 import static java.util.stream.Collectors.joining;

diff --git a/src/main/java/com/speedment/codegen/java/views/ConstructorView.java b/src/main/java/com/speedment/codegen/java/views/ConstructorView.java
@@ -16,8 +16,8 @@
  */
 package com.speedment.codegen.java.views;
 
-import com.speedment.util.CodeCombiner;
-import static com.speedment.codegen.Formatting.*;
+import com.speedment.codegen.util.CodeCombiner;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.interfaces.HasName;

diff --git a/src/main/java/com/speedment/codegen/java/views/EnumConstantView.java b/src/main/java/com/speedment/codegen/java/views/EnumConstantView.java
@@ -16,12 +16,12 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.models.EnumConstant;
 import java.util.Optional;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 
 /**
  *

diff --git a/src/main/java/com/speedment/codegen/java/views/EnumView.java b/src/main/java/com/speedment/codegen/java/views/EnumView.java
@@ -16,10 +16,10 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.lang.models.Enum;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import static java.util.stream.Collectors.joining;
 
 /**

diff --git a/src/main/java/com/speedment/codegen/java/views/FileView.java b/src/main/java/com/speedment/codegen/java/views/FileView.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.DependencyManager;
 import com.speedment.codegen.base.Transform;

diff --git a/src/main/java/com/speedment/codegen/java/views/GenericView.java b/src/main/java/com/speedment/codegen/java/views/GenericView.java
@@ -18,10 +18,10 @@
 
 import com.speedment.codegen.lang.models.Generic;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 
 /**
  *

diff --git a/src/main/java/com/speedment/codegen/java/views/ImportView.java b/src/main/java/com/speedment/codegen/java/views/ImportView.java
@@ -16,10 +16,10 @@
  */
 package com.speedment.codegen.java.views;
 
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import com.speedment.codegen.lang.models.Import;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.models.File;

diff --git a/src/main/java/com/speedment/codegen/java/views/InitalizerView.java b/src/main/java/com/speedment/codegen/java/views/InitalizerView.java
@@ -18,9 +18,9 @@
 
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.lang.models.Initalizer;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Transform;
 
 /**

diff --git a/src/main/java/com/speedment/codegen/java/views/InterfaceFieldView.java b/src/main/java/com/speedment/codegen/java/views/InterfaceFieldView.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.models.InterfaceField;

diff --git a/src/main/java/com/speedment/codegen/java/views/InterfaceMethodView.java b/src/main/java/com/speedment/codegen/java/views/InterfaceMethodView.java
@@ -16,20 +16,20 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.COMMA_SPACE;
-import static com.speedment.codegen.Formatting.EMPTY;
-import static com.speedment.codegen.Formatting.PE;
-import static com.speedment.codegen.Formatting.PS;
-import static com.speedment.codegen.Formatting.SC;
-import static com.speedment.codegen.Formatting.SPACE;
-import static com.speedment.codegen.Formatting.block;
-import static com.speedment.codegen.Formatting.ifelse;
-import static com.speedment.codegen.Formatting.nl;
+import static com.speedment.codegen.util.Formatting.COMMA_SPACE;
+import static com.speedment.codegen.util.Formatting.EMPTY;
+import static com.speedment.codegen.util.Formatting.PE;
+import static com.speedment.codegen.util.Formatting.PS;
+import static com.speedment.codegen.util.Formatting.SC;
+import static com.speedment.codegen.util.Formatting.SPACE;
+import static com.speedment.codegen.util.Formatting.block;
+import static com.speedment.codegen.util.Formatting.ifelse;
+import static com.speedment.codegen.util.Formatting.nl;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.models.InterfaceMethod;
 import static com.speedment.codegen.lang.models.modifiers.Modifier.*;
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import java.util.Optional;
 import java.util.stream.Collectors;
 

diff --git a/src/main/java/com/speedment/codegen/java/views/InterfaceView.java b/src/main/java/com/speedment/codegen/java/views/InterfaceView.java
@@ -16,8 +16,8 @@
  */
 package com.speedment.codegen.java.views;
 
-import com.speedment.codegen.Formatting;
-import static com.speedment.codegen.Formatting.EMPTY;
+import com.speedment.codegen.util.Formatting;
+import static com.speedment.codegen.util.Formatting.EMPTY;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.lang.models.Field;
 import com.speedment.codegen.lang.models.Interface;

diff --git a/src/main/java/com/speedment/codegen/java/views/JavadocTagView.java b/src/main/java/com/speedment/codegen/java/views/JavadocTagView.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.codegen.java.views;
 
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.codegen.lang.models.JavadocTag;

diff --git a/src/main/java/com/speedment/codegen/java/views/JavadocView.java b/src/main/java/com/speedment/codegen/java/views/JavadocView.java
@@ -16,10 +16,10 @@
  */
 package com.speedment.codegen.java.views;
 
-import com.speedment.util.CodeCombiner;
+import com.speedment.codegen.util.CodeCombiner;
 import com.speedment.codegen.lang.models.Javadoc;
 import java.util.Optional;
-import static com.speedment.codegen.Formatting.*;
+import static com.speedment.codegen.util.Formatting.*;
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import java.util.stream.Stream;