Additional work to get modules working.

.gitignore

@@ -1,6 +1,8 @@
 bin
 .DS_Store
 .idea
+.gradle
+.eclipse
 .settings
 *.iml
 classes

android/AndroidManifest.xml

@@ -7,16 +7,16 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         
-        <activity android:name="main.java.org.justcheckers.android.MenuActivity">
+        <activity android:name="org.justcheckers.android.MenuActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         
-		<activity android:name="main.java.org.justcheckers.android.GameActivity" />
+		<activity android:name="org.justcheckers.android.GameActivity" />
-		<activity android:name="main.java.org.justcheckers.android.InfoActivity" />
+		<activity android:name="org.justcheckers.android.InfoActivity" />
-		<activity android:name="main.java.org.justcheckers.android.SettingsActivity" />
+		<activity android:name="org.justcheckers.android.SettingsActivity" />
 		
     </application>
     

android/build.gradle

@@ -31,6 +31,19 @@ version = '0.3'
 // Androids!!!
 android {
 	compileSdkVersion 14
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aild.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        instrumentTest.setRoot('tests')
+    }
 }
 	
 // Setup build script repositories starting with Maven repositories
@@ -43,4 +56,5 @@ repositories {
 // Dependency management
 dependencies {
     compile project(':core')
+    //compile 'org.slf4j:slf4j-android:1.6.1-RC1'
 }

core/src/test/java/org/justcheckers/test/game/AmericanGameTest.java

@@ -20,7 +20,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.test.game;
+package org.justcheckers.test.game;
 
 /**
  * Regression test for a game of checkers played according to American rules.

core/src/test/java/org/justcheckers/test/game/GameLogicTest.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.test.game;
+package org.justcheckers.test.game;
 
 /**
  * Test the game engine logic.  Tests if the game engine can manipulate the

core/src/test/java/org/justcheckers/test/game/GameStateTest.java

@@ -23,6 +23,9 @@ package org.justcheckers.test.game;
 
 import org.justcheckers.game.Game;
 import org.justcheckers.game.Rulebook;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 /**
  * Test the game state logic.  Tests the NQPOJO (not quite plain old Java 
@@ -43,7 +46,7 @@ public class GameStateTest {
 	 * Sets up a rather plain game of checkers.  Game is based on the American
 	 * rules, to make life easier.
 	 */
-	//@BeforeClass
+	@BeforeClass
 	public void setUp() {
 		this.testGame = new Game();
 	}
@@ -51,11 +54,11 @@ public class GameStateTest {
 	/** 
 	 * Test the rulebook of a default initialized game.
 	 */
-	//@Test
+	@Test
 	public void testDefaultRulebookSetup() {
 		Rulebook testRules = this.testGame.getGameRules();
 		
-		junit.framework.Assert.assertNull(testRules);
+		Assert.assertNull(testRules);
 		
 		//TODO: Test the ruleset that is gets initialized properly.
 	}

core/src/test/java/org/justcheckers/test/game/InternationalGameTest.java

@@ -20,7 +20,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.test.game;
+package org.justcheckers.test.game;
 
 /**
  * Regression test for a game of checkers played according to International 

web/build.gradle

@@ -9,8 +9,6 @@
         http://www.gradle.org/docs/current/userguide/userguide_single.html
 */
 
-apply plugin: 'java'
-
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
@@ -34,15 +32,10 @@ project.ext {
     appBaseName = "justcheckers"
 
     hibernateVersion = '3.5.4-Final'
-    slf4jVersion = '1.6.0'
+    slf4jVersion = '1.7.5'
 	springVersion = '3.1.3.RELEASE'
 }
 	
-// Setup everything to work with the Eclipse friendly Web setup.
-//sourceSets.main.java.srcDirs = ['src', 'gen']
-//sourceSets.main.resources.srcDirs = ['res']
-//sourceSets.test.java.srcDirs = ['test-src']
-	
 // Setup build script repositories starting with Maven repositories
 repositories {
 	maven {
@@ -53,12 +46,10 @@ repositories {
 // Dependency management
 dependencies {
 
-	//compile 'org.jdom:jdom:1.1'
+	compile project(':core')
-	//compile 'jdom:jdom:0.9'
-	compile 'jdom:jdom:0.7'
 
     // Spring Framework + SLF4J
-    /*compile ('org.springframework:spring-context:' + project.springVersion) {
+    compile ('org.springframework:spring-context:' + project.springVersion) {
         exclude module: 'commons-logging'
     }
     compile 'log4j:log4j:1.2.16'
@@ -70,29 +61,21 @@ dependencies {
     compile 'org.springframework:spring-orm:' + project.springVersion
     compile 'org.springframework:spring-webmvc:' + project.springVersion
     compile 'org.springframework:spring-parent:' + project.springVersion
-	*/    
-//compile 'mysql:mysql-connector-java:5.1.22'
 
     // xstream
-    //compile 'com.thoughtworks.xstream:xstream:1.4.4'
+    compile 'com.thoughtworks.xstream:xstream:1.4.4'
 
     // Hibernate + C3P0
-/*
     compile 'org.hibernate:hibernate:' + project.hibernateVersion
     compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion
     compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion
     compile 'javassist:javassist:3.9.0.GA'
-*/
-
-    // Apache Commons Libraries
-    //compile 'commons-httpclient:commons-httpclient:3.1'
-    //compile 'commons-lang:commons-lang:2.4'
 
     // FlexJson
-//    compile 'net.sf.flexjson:flexjson:2.1'
+    compile 'net.sf.flexjson:flexjson:2.1'
 
     // Javax Servlet and Mail APIs
-    //providedCompile 'javax.servlet:servlet-api:2.5'
+    providedCompile 'javax.servlet:servlet-api:2.5'
 }
 
 // At the end of day we just need a JAR and a WAR.