Merge pull request #12 from neothemachine/dependencies

Major cleanup and transition to Maven-only

46 files changed, 1 insertions, 88 deletions

diff --git a/ardor3d-lwjgl/.classpath b/ardor3d-lwjgl/.classpath
deleted file mode 100644
index 1f07b8b..0000000
--- a/ardor3d-lwjgl/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ardor3d-core"/>
-	<classpathentry exported="true" kind="lib" path="lib/lwjgl/jinput.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lwjgl/lwjgl_util_applet.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lwjgl/lwjgl_util.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lwjgl/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="ardor3d-lwjgl/lib/lwjgl/native/windows"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ardor3d-lwjgl/.project b/ardor3d-lwjgl/.project
deleted file mode 100644
index d05e7c1..0000000
--- a/ardor3d-lwjgl/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ardor3d-lwjgl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ardor3d-lwjgl/.settings/org.eclipse.core.resources.prefs b/ardor3d-lwjgl/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 92ebe05..0000000
--- a/ardor3d-lwjgl/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jan 07 11:33:20 PST 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/ardor3d-lwjgl/.settings/org.eclipse.jdt.core.prefs b/ardor3d-lwjgl/.settings/org.eclipse.jdt.core.prefs
index de9377a..19eadb6 100644
--- a/ardor3d-lwjgl/.settings/org.eclipse.jdt.core.prefs
+++ b/ardor3d-lwjgl/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Tue Apr 06 11:30:57 CDT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -17,6 +16,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/ardor3d-lwjgl/.settings/org.eclipse.jdt.ui.prefs b/ardor3d-lwjgl/.settings/org.eclipse.jdt.ui.prefs
index f479490..7588391 100644
--- a/ardor3d-lwjgl/.settings/org.eclipse.jdt.ui.prefs
+++ b/ardor3d-lwjgl/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Sun Jan 04 11:43:23 CST 2009

 cleanup.add_default_serial_version_id=true

 cleanup.add_generated_serial_version_id=false

 cleanup.add_missing_annotations=true

diff --git a/ardor3d-lwjgl/lib/lwjgl/LICENSE b/ardor3d-lwjgl/lib/lwjgl/LICENSE
deleted file mode 100644
index d277220..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 

- * Copyright (c) 2002-2008 Lightweight Java Game Library Project

- * All rights reserved.

- * 

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are 

- * met:

- * 

- * * Redistributions of source code must retain the above copyright 

- *   notice, this list of conditions and the following disclaimer.

- *

- * * Redistributions in binary form must reproduce the above copyright

- *   notice, this list of conditions and the following disclaimer in the

- *   documentation and/or other materials provided with the distribution.

- *

- * * Neither the name of 'Light Weight Java Game Library' nor the names of 

- *   its contributors may be used to endorse or promote products derived 

- *   from this software without specific prior written permission.

- * 

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 

- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 

- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */
\ No newline at end of file
diff --git a/ardor3d-lwjgl/lib/lwjgl/jinput.jar b/ardor3d-lwjgl/lib/lwjgl/jinput.jar
deleted file mode 100644
index 7c2b6b0..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/jinput.jar
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/lwjgl.jar b/ardor3d-lwjgl/lib/lwjgl/lwjgl.jar
deleted file mode 100644
index a0fb56d..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/lwjgl.jar
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/lwjgl_util.jar b/ardor3d-lwjgl/lib/lwjgl/lwjgl_util.jar
deleted file mode 100644
index 9973b24..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/lwjgl_util.jar
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/lwjgl_util_applet.jar b/ardor3d-lwjgl/lib/lwjgl/lwjgl_util_applet.jar
deleted file mode 100644
index a8872e2..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/lwjgl_util_applet.jar
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux.so
deleted file mode 100644
index 3cdc439..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux64.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux64.so
deleted file mode 100644
index de1ee5f..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/libjinput-linux64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl.so
deleted file mode 100644
index 5a02874..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl64.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl64.so
deleted file mode 100644
index 4572589..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/liblwjgl64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal.so
deleted file mode 100644
index 7742faf..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal64.so b/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal64.so
deleted file mode 100644
index d1e45e5..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/linux/libopenal64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/macosx/libjinput-osx.jnilib b/ardor3d-lwjgl/lib/lwjgl/native/macosx/libjinput-osx.jnilib
deleted file mode 100644
index 59a3eab..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/macosx/libjinput-osx.jnilib
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/macosx/liblwjgl.jnilib b/ardor3d-lwjgl/lib/lwjgl/native/macosx/liblwjgl.jnilib
deleted file mode 100644
index cbb5b4c..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/macosx/liblwjgl.jnilib
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl.so b/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl.so
deleted file mode 100644
index 57568ab..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl64.so b/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl64.so
deleted file mode 100644
index 96bc8a2..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/solaris/liblwjgl64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal.so b/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal.so
deleted file mode 100644
index 17369bd..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal64.so b/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal64.so
deleted file mode 100644
index 1a51964..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/solaris/libopenal64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL32.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL32.dll
deleted file mode 100644
index 6dd2600..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL32.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL64.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL64.dll
deleted file mode 100644
index 00c98c0..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/OpenAL64.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8.dll
deleted file mode 100644
index 6d27ad5..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8_64.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8_64.dll
deleted file mode 100644
index 6730589..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-dx8_64.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw.dll
deleted file mode 100644
index ce1d162..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw_64.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw_64.dll
deleted file mode 100644
index 3d2b3ad..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/jinput-raw_64.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl.dll
deleted file mode 100644
index 6819404..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl64.dll b/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl64.dll
deleted file mode 100644
index e66ab2a..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/native/windows/lwjgl64.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/lib/lwjgl/version_info.txt b/ardor3d-lwjgl/lib/lwjgl/version_info.txt
deleted file mode 100644
index 0630459..0000000
--- a/ardor3d-lwjgl/lib/lwjgl/version_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-lwjgl version: 2.8.4
\ No newline at end of file
diff --git a/ardor3d-lwjgl/pom.xml b/ardor3d-lwjgl/pom.xml
index 2489e5d..49a0ab7 100644
--- a/ardor3d-lwjgl/pom.xml
+++ b/ardor3d-lwjgl/pom.xml
@@ -20,20 +20,6 @@
                     <target>1.6</target>

                 </configuration>

             </plugin>

-            <plugin>

-				<groupId>com.googlecode.mavennatives</groupId>

-				<artifactId>maven-nativedependencies-plugin</artifactId>

-				<version>0.0.5</version>

-				<executions>

-					<execution>

-						<id>unpacknatives</id>

-						<phase>generate-resources</phase>

-						<goals>

-							<goal>copy</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

         </plugins>

     </build>

     <dependencies>

@@ -50,9 +36,5 @@
             <groupId>org.lwjgl.lwjgl</groupId>

             <artifactId>lwjgl_util</artifactId>

         </dependency>

-        <dependency>

-            <groupId>net.java.games.input</groupId>

-            <artifactId>jinput</artifactId>

-        </dependency>

     </dependencies>

 </project>

diff --git a/ardor3d-lwjgl/src/main/native/linux/libjinput-linux.so b/ardor3d-lwjgl/src/main/native/linux/libjinput-linux.so
deleted file mode 100644
index b6f1090..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/libjinput-linux.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/linux/libjinput-linux64.so b/ardor3d-lwjgl/src/main/native/linux/libjinput-linux64.so
deleted file mode 100644
index 5fb7265..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/libjinput-linux64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/linux/liblwjgl.so b/ardor3d-lwjgl/src/main/native/linux/liblwjgl.so
deleted file mode 100644
index b5271dd..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/liblwjgl.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/linux/liblwjgl64.so b/ardor3d-lwjgl/src/main/native/linux/liblwjgl64.so
deleted file mode 100644
index 2ba3daa..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/liblwjgl64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/linux/libopenal.so b/ardor3d-lwjgl/src/main/native/linux/libopenal.so
deleted file mode 100644
index 2b5a8d5..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/libopenal.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/linux/libopenal64.so b/ardor3d-lwjgl/src/main/native/linux/libopenal64.so
deleted file mode 100644
index ce1c38f..0000000
--- a/ardor3d-lwjgl/src/main/native/linux/libopenal64.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/macosx/libjinput-osx.jnilib b/ardor3d-lwjgl/src/main/native/macosx/libjinput-osx.jnilib
deleted file mode 100644
index 51c089c..0000000
--- a/ardor3d-lwjgl/src/main/native/macosx/libjinput-osx.jnilib
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/macosx/liblwjgl.jnilib b/ardor3d-lwjgl/src/main/native/macosx/liblwjgl.jnilib
deleted file mode 100644
index 8d8c446..0000000
--- a/ardor3d-lwjgl/src/main/native/macosx/liblwjgl.jnilib
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/solaris/liblwjgl.so b/ardor3d-lwjgl/src/main/native/solaris/liblwjgl.so
deleted file mode 100644
index d8155d1..0000000
--- a/ardor3d-lwjgl/src/main/native/solaris/liblwjgl.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/solaris/libopenal.so b/ardor3d-lwjgl/src/main/native/solaris/libopenal.so
deleted file mode 100644
index 50edb3e..0000000
--- a/ardor3d-lwjgl/src/main/native/solaris/libopenal.so
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/win32/OpenAL32.dll b/ardor3d-lwjgl/src/main/native/win32/OpenAL32.dll
deleted file mode 100644
index 8dc9fa5..0000000
--- a/ardor3d-lwjgl/src/main/native/win32/OpenAL32.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/win32/jinput-dx8.dll b/ardor3d-lwjgl/src/main/native/win32/jinput-dx8.dll
deleted file mode 100644
index 0ad824b..0000000
--- a/ardor3d-lwjgl/src/main/native/win32/jinput-dx8.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/win32/jinput-raw.dll b/ardor3d-lwjgl/src/main/native/win32/jinput-raw.dll
deleted file mode 100644
index 2a014f6..0000000
--- a/ardor3d-lwjgl/src/main/native/win32/jinput-raw.dll
+++ /dev/null
diff --git a/ardor3d-lwjgl/src/main/native/win32/lwjgl.dll b/ardor3d-lwjgl/src/main/native/win32/lwjgl.dll
deleted file mode 100644
index 387c60d..0000000
--- a/ardor3d-lwjgl/src/main/native/win32/lwjgl.dll
+++ /dev/null