Moves the controller based on JInput into a separate sub-project called ardor3d-jinput

9 files changed, 41 insertions, 5 deletions

diff --git a/ardor3d-examples/build.gradle b/ardor3d-examples/build.gradle
index ffd2915..d1eeeab 100644
--- a/ardor3d-examples/build.gradle
+++ b/ardor3d-examples/build.gradle
@@ -3,6 +3,7 @@ description = 'Ardor 3D Examples'
 dependencies {
   compile project(':ardor3d-awt')
   compile project(':ardor3d-swt')
+  compile project(':ardor3d-jinput')
   compile project(':ardor3d-jogl')
   compile project(':ardor3d-effects')
   compile project(':ardor3d-extras')
diff --git a/ardor3d-examples/pom.xml b/ardor3d-examples/pom.xml
index d06510c..f5f742d 100644
--- a/ardor3d-examples/pom.xml
+++ b/ardor3d-examples/pom.xml
@@ -119,6 +119,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>ardor3d-jinput</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>ardor3d-jogl</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/ardor3d-jinput/build.gradle b/ardor3d-jinput/build.gradle
new file mode 100644
index 0000000..b7bff7b
--- /dev/null
+++ b/ardor3d-jinput/build.gradle
@@ -0,0 +1,6 @@
+
+description = 'Ardor 3D JINPUT'
+dependencies {
+  compile project(':ardor3d-core')
+    compile group: 'net.java.jinput', name: 'jinput', version:'2.0.6'
+}
diff --git a/ardor3d-jinput/pom.xml b/ardor3d-jinput/pom.xml
new file mode 100644
index 0000000..48f7910
--- /dev/null
+++ b/ardor3d-jinput/pom.xml
@@ -0,0 +1,26 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ardor3d</groupId>
+        <artifactId>ardor3d</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ardor3d-jinput</artifactId>
+    <packaging>bundle</packaging>
+    <name>Ardor 3D JINPUT</name>
+  
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ardor3d-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.jinput</groupId>
+            <artifactId>jinput</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java b/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
index 52ab50a..52ab50a 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
+++ b/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
diff --git a/ardor3d-jogl/build.gradle b/ardor3d-jogl/build.gradle
index c5f99ac..638a163 100644
--- a/ardor3d-jogl/build.gradle
+++ b/ardor3d-jogl/build.gradle
@@ -4,6 +4,5 @@ dependencies {
   compile project(':ardor3d-core')
     compile group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.2.4'
     compile group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.2.4'
-    compile group: 'net.java.jinput', name: 'jinput', version:'2.0.6'
     compile group: 'org.eclipse.swt', name: 'org.eclipse.swt.gtk.linux.x86_64', version:'3.8'
 }
diff --git a/ardor3d-jogl/pom.xml b/ardor3d-jogl/pom.xml
index e14ff2a..f0d90cc 100644
--- a/ardor3d-jogl/pom.xml
+++ b/ardor3d-jogl/pom.xml
@@ -47,10 +47,6 @@
           <artifactId>jocl-main</artifactId>
         </dependency-->
         <dependency>
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.eclipse.swt</groupId>
             <artifactId>${swt.artifactId}</artifactId>
             <version>${swt.version}</version>
diff --git a/pom.xml b/pom.xml
index 4df530a..f7ba1df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
         <module>ardor3d-savable</module>
         <module>ardor3d-math</module>
         <module>ardor3d-core</module>
+        <module>ardor3d-jinput</module>
         <module>ardor3d-jogl</module>
         <module>ardor3d-swt</module>
         <module>ardor3d-awt</module>
diff --git a/settings.gradle b/settings.gradle
index cc496cb..e2a2538 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@ rootProject.name = 'ardor3d'
 include ':ardor3d-savable'
 include ':ardor3d-math'
 include ':ardor3d-core'
+include ':ardor3d-jinput'
 include ':ardor3d-jogl'
 include ':ardor3d-swt'
 include ':ardor3d-awt'
@@ -17,6 +18,7 @@ include ':distribution'
 project(':ardor3d-savable').projectDir = "$rootDir/ardor3d-savable" as File
 project(':ardor3d-math').projectDir = "$rootDir/ardor3d-math" as File
 project(':ardor3d-core').projectDir = "$rootDir/ardor3d-core" as File
+project(':ardor3d-jinput').projectDir = "$rootDir/ardor3d-jinput" as File
 project(':ardor3d-jogl').projectDir = "$rootDir/ardor3d-jogl" as File
 project(':ardor3d-swt').projectDir = "$rootDir/ardor3d-swt" as File
 project(':ardor3d-awt').projectDir = "$rootDir/ardor3d-awt" as File