Compare commits

..

No commits in common. "master" and "modular-project" have entirely different histories.

38 changed files with 34 additions and 36 deletions

2
.gitignore vendored
View File

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

View File

@ -31,19 +31,6 @@ version = '0.3'
// Androids!!! // Androids!!!
android { android {
compileSdkVersion 14 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 // Setup build script repositories starting with Maven repositories
@ -56,5 +43,4 @@ repositories {
// Dependency management // Dependency management
dependencies { dependencies {
compile project(':core') compile project(':core')
//compile 'org.slf4j:slf4j-android:1.6.1-RC1'
} }

View File

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

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

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

View File

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

View File

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

View File

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

View File

@ -9,6 +9,8 @@
http://www.gradle.org/docs/current/userguide/userguide_single.html http://www.gradle.org/docs/current/userguide/userguide_single.html
*/ */
apply plugin: 'java'
sourceCompatibility = 1.6 sourceCompatibility = 1.6
targetCompatibility = 1.6 targetCompatibility = 1.6
@ -32,10 +34,15 @@ project.ext {
appBaseName = "justcheckers" appBaseName = "justcheckers"
hibernateVersion = '3.5.4-Final' hibernateVersion = '3.5.4-Final'
slf4jVersion = '1.7.5' slf4jVersion = '1.6.0'
springVersion = '3.1.3.RELEASE' 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 // Setup build script repositories starting with Maven repositories
repositories { repositories {
maven { maven {
@ -46,10 +53,12 @@ repositories {
// Dependency management // Dependency management
dependencies { dependencies {
compile project(':core') //compile 'org.jdom:jdom:1.1'
//compile 'jdom:jdom:0.9'
compile 'jdom:jdom:0.7'
// Spring Framework + SLF4J // Spring Framework + SLF4J
compile ('org.springframework:spring-context:' + project.springVersion) { /*compile ('org.springframework:spring-context:' + project.springVersion) {
exclude module: 'commons-logging' exclude module: 'commons-logging'
} }
compile 'log4j:log4j:1.2.16' compile 'log4j:log4j:1.2.16'
@ -61,21 +70,29 @@ dependencies {
compile 'org.springframework:spring-orm:' + project.springVersion compile 'org.springframework:spring-orm:' + project.springVersion
compile 'org.springframework:spring-webmvc:' + project.springVersion compile 'org.springframework:spring-webmvc:' + project.springVersion
compile 'org.springframework:spring-parent:' + project.springVersion compile 'org.springframework:spring-parent:' + project.springVersion
*/
//compile 'mysql:mysql-connector-java:5.1.22'
// xstream // xstream
compile 'com.thoughtworks.xstream:xstream:1.4.4' //compile 'com.thoughtworks.xstream:xstream:1.4.4'
// Hibernate + C3P0 // Hibernate + C3P0
/*
compile 'org.hibernate:hibernate:' + project.hibernateVersion compile 'org.hibernate:hibernate:' + project.hibernateVersion
compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion
compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion
compile 'javassist:javassist:3.9.0.GA' 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 // FlexJson
compile 'net.sf.flexjson:flexjson:2.1' // compile 'net.sf.flexjson:flexjson:2.1'
// Javax Servlet and Mail APIs // 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. // At the end of day we just need a JAR and a WAR.