diff --git a/examples/javaonedemo/.project b/examples/javaonedemo/.project
deleted file mode 100644
index bd14ae41bde1d094bca605ff4ddfeb2f38a150ef..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>javaonedemo</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/examples/javaonedemo/build.xml b/examples/javaonedemo/build.xml
deleted file mode 100644
index 32664d5de874b8c0ec8a4ae093ae4de21da5d57c..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/build.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="javaonedemo" default="build" basedir=".">
-
- <path id="compiler.class.path">
- <pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar"/>
- <pathelement path="../third-party/jogamp/jogl-all.jar"/>
- <pathelement path="../third-party/jogamp/gluegen-rt.jar"/>
- </path>
-
- <path id="runtime.class.path" cache="true">
- <path refid="compiler.class.path"/>
- <pathelement path="${ant.project.name}.jar"/>
- </path>
-
- <target name="build" depends="clean">
- <mkdir dir="classes"/>
- <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
- <classpath refid="compiler.class.path"/>
- </javac>
- <copy todir="classes/com/amd/aparapi/examples/javaonedemo" file="src/com/amd/aparapi/examples/javaonedemo/particle.jpg"/>
- <jar jarfile="${ant.project.name}.jar" basedir="classes"/>
- </target>
-
- <target name="clean">
- <delete dir="classes"/>
- <delete file="${ant.project.name}.jar"/>
- </target>
-
-</project>
diff --git a/examples/javaonedemo/get-jogamp-build.xml b/examples/javaonedemo/get-jogamp-build.xml
deleted file mode 100644
index 78b2b35dd1c7bd906c1cbfcaa0e2429d234fcfcf..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/get-jogamp-build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="nbody" default="get" basedir=".">
- <property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_52-joal_32-jogl_66-jocl_41/jar"/>
- <target name="get">
- <!-- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>-->
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-windows-i586.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-i586.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-windows-i586.jar" dest="jogamp/windows-x86"/>
- <unzip src="jogamp/gluegen-rt-natives-windows-i586.jar" dest="jogamp/windows-x86"/>
- <delete dir="jogamp/windows-x86/META-INF"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-windows-amd64.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-amd64.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-windows-amd64.jar" dest="jogamp/windows-amd64"/>
- <unzip src="jogamp/gluegen-rt-natives-windows-amd64.jar" dest="jogamp/windows-amd64"/>
- <delete dir="jogamp/windows-amd64/META-INF"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-linux-i586.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-i586.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-linux-i586.jar" dest="jogamp/linux-i586"/>
- <unzip src="jogamp/gluegen-rt-natives-linux-i586.jar" dest="jogamp/linux-i586"/>
- <delete dir="jogamp/linux-i586/META-INF"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-linux-amd64.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-amd64.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-linux-amd64.jar" dest="jogamp/linux-amd64"/>
- <unzip src="jogamp/gluegen-rt-natives-linux-amd64.jar" dest="jogamp/linux-amd64"/>
- <delete dir="jogamp/linux-amd64/META-INF"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-macosx-universal.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-macosx-universal.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-macosx-universal.jar" dest="jogamp/macosx-universal"/>
- <unzip src="jogamp/gluegen-rt-natives-macosx-universal.jar" dest="jogamp/macosx-universal"/>
- <delete dir="jogamp/macosx-universal/META-INF"/>
- </target>
-
-</project>
diff --git a/examples/javaonedemo/life.bat b/examples/javaonedemo/life.bat
deleted file mode 100644
index 75673e4ae67af55d583b7d279f251cae65d4a95c..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/life.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-java ^
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist ^
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar;javaonedemo.jar ^
- com.syncleus.aparapi.examples.javaonedemo.Life
-
-
diff --git a/examples/javaonedemo/life.sh b/examples/javaonedemo/life.sh
deleted file mode 100644
index 357192c8dc95c39d10b0f39ddecf44aa4e6247e9..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/life.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-java \
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist \
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar:javaonedemo.jar \
- com.syncleus.aparapi.examples.javaonedemo.Life
diff --git a/examples/javaonedemo/mandel.bat b/examples/javaonedemo/mandel.bat
deleted file mode 100644
index 0f52d14e8eecd8e44fba096910a566f175455ef1..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/mandel.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-java ^
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist ^
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar;javaonedemo.jar ^
- com.syncleus.aparapi.examples.javaonedemo.Mandel
-
-
diff --git a/examples/javaonedemo/mandel.sh b/examples/javaonedemo/mandel.sh
deleted file mode 100644
index f8b1d2ad6db3763bed74dc6970296cce28702827..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/mandel.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-java \
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist \
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar:javaonedemo.jar \
- com.syncleus.aparapi.examples.javaonedemo.Mandel
diff --git a/examples/javaonedemo/nbody.bat b/examples/javaonedemo/nbody.bat
deleted file mode 100644
index 22fe17b14371e0a811d21fed6d4f4ea48bb38131..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/nbody.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-java ^
- -Djava.library.path=..\..\com.syncleus.aparapi.jni\dist;..\third-party\jogamp\windows-%PROCESSOR_ARCHITECTURE% ^
- -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;javaonedemo.jar ^
- com.syncleus.aparapi.examples.javaonedemo.NBody
-
-
diff --git a/examples/javaonedemo/nbody.sh b/examples/javaonedemo/nbody.sh
deleted file mode 100644
index 5f6d1f55dbf02dd010831e9455256a712a6758e1..0000000000000000000000000000000000000000
--- a/examples/javaonedemo/nbody.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-java -Djava.library.path=../../com.syncleus.aparapi.jni/dist:../third-party/jogamp \
- -classpath ../third-party/jogamp/gluegen-rt.jar:../third-party/jogamp/jogl-all.jar:../../com.syncleus.aparapi/dist/aparapi.jar:javaonedemo.jar \
- com.syncleus.aparapi.examples.javaonedemo.NBody
diff --git a/pom.xml b/pom.xml
index b9d74aa776424807054b6a4b872fc04a6b690ff9..82de46d0c798edda34d318d912d716e0da6468f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,16 @@
<artifactId>aparapi</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen</artifactId>
+ <version>2.3.2</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 21561e937742acff5663b5b0018a6c252ddaa67c..8c9706f661f3c1f30b477916f018c3ca49129db7 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -24,24 +24,27 @@ public class All {
System.out.println(" 7) Blacksholes");
System.out.println(" 8) Squares");
System.out.println(" 9) Multipass swing worker");
- System.out.println(" 10) Progress and cancel demo");
- System.out.println(" 11) Info");
- System.out.println(" 12) Medians");
- System.out.println(" 13) MDArray");
- System.out.println(" 14) Add");
- System.out.println(" 15) Extension - FFT");
- System.out.println(" 16) Extension - Histogram");
- System.out.println(" 17) Extension - Histogram Ideal");
- System.out.println(" 18) Extension - Mandel");
- System.out.println(" 19) Extension - Square");
- System.out.println(" 20) Configuration - Auto cleanup arrays");
- System.out.println(" 21) Configuration - Cleanup arrays");
- System.out.println(" 22) Configuration - Configuration");
- System.out.println(" 23) Configuration - Custom Configuration");
- System.out.println(" 24) Configuration - Legacy Configuration");
- System.out.println(" 25) Configuration - Profiling");
- System.out.println(" 26) Configuration - Profiling (no binary)");
- System.out.println(" 27) Effects");
+ System.out.println(" 10) Progress and cancel demo");
+ System.out.println(" 11) Info");
+ System.out.println(" 12) Medians");
+ System.out.println(" 13) MDArray");
+ System.out.println(" 14) Add");
+ System.out.println(" 15) Extension - FFT");
+ System.out.println(" 16) Extension - Histogram");
+ System.out.println(" 17) Extension - Histogram Ideal");
+ System.out.println(" 18) Extension - Mandel");
+ System.out.println(" 19) Extension - Square");
+ System.out.println(" 20) Configuration - Auto cleanup arrays");
+ System.out.println(" 21) Configuration - Cleanup arrays");
+ System.out.println(" 22) Configuration - Configuration");
+ System.out.println(" 23) Configuration - Custom Configuration");
+ System.out.println(" 24) Configuration - Legacy Configuration");
+ System.out.println(" 25) Configuration - Profiling");
+ System.out.println(" 26) Configuration - Profiling (no binary)");
+ System.out.println(" 27) Effects");
+ System.out.println(" 28) Javaone - Game of Life");
+ System.out.println(" 29) Javaone - Mandlebrot");
+ System.out.println(" 30) Javaone - NBody");
System.out.println();
Scanner in = new Scanner(System.in);
@@ -153,6 +156,15 @@ public class All {
case "27":
com.syncleus.aparapi.examples.effects.Main.main(args);
break;
+ case "28":
+ com.syncleus.aparapi.examples.javaonedemo.Life.main(args);
+ break;
+ case "29":
+ com.syncleus.aparapi.examples.javaonedemo.Mandel.main(args);
+ break;
+ case "30":
+ com.syncleus.aparapi.examples.javaonedemo.NBody.main(args);
+ break;
default:
System.out.println("Invalid selection.");
}
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Life.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java
similarity index 95%
rename from examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Life.java
rename to src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java
index df4dcf0071a5a24e8c2c229b4997fadea9a3bfd7..d7f471b10c3ae02f400b852b1f00b599b0c73396 100644
--- a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Life.java
+++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
/*
Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
All rights reserved.
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Mandel.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java
similarity index 95%
rename from examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Mandel.java
rename to src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java
index 6218b2eda60cca911e344a45632cc1e75fed672c..84ad938470213a6d23f994ab4fdba67172f28aca 100644
--- a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/Mandel.java
+++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
/*
Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
All rights reserved.
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java
similarity index 92%
rename from examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java
rename to src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java
index a4f803443f98d8e34e0fd9876bfd159e69b65ce9..a06d8e0d525da9887efcfe86bfc18d960953ded4 100644
--- a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java
+++ b/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
/*
Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
All rights reserved.
@@ -48,16 +58,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.glu.GLU;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/duke.jpg b/src/main/resources/duke.jpg
similarity index 100%
rename from examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/duke.jpg
rename to src/main/resources/duke.jpg
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/particle.jpg b/src/main/resources/particle.jpg
similarity index 100%
rename from examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/particle.jpg
rename to src/main/resources/particle.jpg