Merge branch 'Support-Multiple-Languages' of tflucke/iEat2 into master

build.xml

@@ -29,12 +29,15 @@
   <property name="test.target.dir" value="${build.dir}/tests"/>
 
   <property name="source.dir" value="src/"/>
-  <property name="target.dir" value="${build.dir}/${app.name}/WEB-INF/classes"/>
+  <property name="source.dir.java" value="${source.dir}/java"/>
+  <property name="target.dir.server"
+            value="${build.dir}/${app.name}/WEB-INF/classes"/>
+  <property name="target.dir.client" value="${build.dir}/${app.name}/js"/>
 
   <property prefix="compile" file="${ant.conf.dir}/compile.properties"/>
   <property name="compile.lib" value="${lib.dir}/compile"/>
   <path id="compile.classpath">
-	<pathelement location="${target.dir}"/>
+	<pathelement location="${target.dir.server}"/>
 	<fileset dir="${compile.lib}" includes="*.jar"/>
   </path>
     
@@ -111,11 +114,13 @@
           depends="ivy.resolve.compile,ivy.resolve.war,ivy.resolve.ant"
           description="Use ivy to resolve compilation dependencies"/>
 
-  <target name="compile.server" depends="ivy.resolve.compile" description="Compile server source files">
-    <mkdir dir="${target.dir}"/>
-	<javac srcdir="${source.dir}"
+  <target name="compile.server" depends="ivy.resolve.compile"
+          description="Compile server source files">
+    <mkdir dir="${target.dir.server}"/>
+	<javac srcdir="${source.dir.java}"
+           excludes="name.tflucke.ieat2/client/**"
            verbose="${compile.verbose}"
-		   destdir="${target.dir}"
+		   destdir="${target.dir.server}"
 		   debug="${compile.debug}" 
 		   deprecation="${compile.deprecation}" 
 		   optimize="${compile.optimize}" 
@@ -128,7 +133,13 @@
 	</javac>
   </target>
 
-  <target name="compile.tests" depends="ivy.resolve.test,compile.server" description="Compile test files">
+  <target name="compile.client" depends="ivy.resolve.compile"
+          description="Compile client source files">
+    <mkdir dir="${target.dir.client}"/>
+  </target>
+
+  <target name="compile.tests" depends="ivy.resolve.test,compile.server"
+          description="Compile test files">
     <mkdir dir="${test.target.dir}"/>
 	<javac srcdir="${test.dir}"
            verbose="${compile.verbose}"
@@ -148,13 +159,16 @@
 	</javac>
   </target>
   
-  <target name="war" depends="compile.server,ivy.resolve.war"
+  <target name="war" depends="compile.server,compile.client,ivy.resolve.war"
           description="Create application WAR">
 	<mkdir dir="${build.dir}"/>
 	<war warfile="${build.warfile}" webxml="${app.conf.dir}/web.xml">
       <lib dir="${build.lib}"/>
       <fileset dir="web"/>
-      <classes dir="${target.dir}"/>
+      <fileset dir="${build.dir}/${app.name}">
+         <include name="js/**/*.js"/>
+      </fileset>
+      <classes dir="${target.dir.server}"/>
       <classes dir="${app.conf.dir}">
         <exclude name="web.xml"/>
       </classes>
@@ -190,7 +204,8 @@
 	<delete dir="${build.dir}" />
   </target>
 
-  <target name="clean.full" depends="clean" description="Delete build files and dependencies">
+  <target name="clean.full" depends="clean"
+          description="Delete build files and dependencies">
 	<delete dir="${ivy.jar}"/>
     <delete dir="${lib.dir}"/>
     <ivy:cleancache/>

src/name/tflucke/ieat2/AppInitializer.java → src/java/name/tflucke/ieat2/server/AppInitializer.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2;
+package name.tflucke.ieat2.server;
 
 import javax.servlet.Filter;
 
@@ -9,7 +9,7 @@ import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatche
 
 import org.apache.log4j.Logger;
 
-import name.tflucke.ieat2.configs.RootConfig;
+import name.tflucke.ieat2.server.configs.RootConfig;
 
 /**
  * Entry point for running the spring application.

src/name/tflucke/ieat2/configs/DBConfig.java → src/java/name/tflucke/ieat2/server/configs/DBConfig.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.configs;
+package name.tflucke.ieat2.server.configs;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Bean;

src/name/tflucke/ieat2/configs/JacksonConfig.java → src/java/name/tflucke/ieat2/server/configs/JacksonConfig.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.configs;
+package name.tflucke.ieat2.server.configs;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Bean;

src/name/tflucke/ieat2/configs/RootConfig.java → src/java/name/tflucke/ieat2/server/configs/RootConfig.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.configs;
+package name.tflucke.ieat2.server.configs;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;

src/name/tflucke/ieat2/configs/WebConfig.java → src/java/name/tflucke/ieat2/server/configs/WebConfig.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.configs;
+package name.tflucke.ieat2.server.configs;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

src/name/tflucke/ieat2/controllers/AbstractController.java → src/java/name/tflucke/ieat2/server/controllers/AbstractController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import java.util.List;
 import java.util.Arrays;
@@ -23,8 +23,8 @@ import org.mongodb.morphia.query.UpdateOperations;
 
 import org.bson.types.ObjectId;
 
-import name.tflucke.ieat2.models.DBObject;
-import name.tflucke.ieat2.errors.ResourceNotFoundException;
+import name.tflucke.ieat2.server.models.DBObject;
+import name.tflucke.ieat2.server.errors.ResourceNotFoundException;
 
 /**
  * Generic framework controller providing sane defaults for most REST operations.

src/name/tflucke/ieat2/controllers/FoodController.java → src/java/name/tflucke/ieat2/server/controllers/FoodController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import java.util.List;
 
@@ -10,10 +10,10 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import name.tflucke.ieat2.models.BasicFood;
-import name.tflucke.ieat2.models.Food;
-import name.tflucke.ieat2.models.Recipe;
-import name.tflucke.ieat2.errors.ResourceWrongTypeException;
+import name.tflucke.ieat2.server.models.BasicFood;
+import name.tflucke.ieat2.server.models.Food;
+import name.tflucke.ieat2.server.models.Recipe;
+import name.tflucke.ieat2.server.errors.ResourceWrongTypeException;
 
 /**
  * Provides APIs for managing Food objects and it's subclasses.

src/name/tflucke/ieat2/controllers/NutrDefController.java → src/java/name/tflucke/ieat2/server/controllers/NutrDefController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import name.tflucke.ieat2.models.NutrDef;
+import name.tflucke.ieat2.server.models.NutrDef;
 
 import org.springframework.beans.factory.annotation.Value;
 

src/name/tflucke/ieat2/controllers/UnitController.java → src/java/name/tflucke/ieat2/server/controllers/UnitController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import name.tflucke.ieat2.models.Unit;
+import name.tflucke.ieat2.server.models.Unit;
 
 import org.springframework.beans.factory.annotation.Value;
 

src/name/tflucke/ieat2/controllers/ViewController.java → src/java/name/tflucke/ieat2/server/controllers/ViewController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

src/name/tflucke/ieat2/controllers/WeightController.java → src/java/name/tflucke/ieat2/server/controllers/WeightController.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.controllers;
+package name.tflucke.ieat2.server.controllers;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import name.tflucke.ieat2.models.Weight;
+import name.tflucke.ieat2.server.models.Weight;
 
 import org.springframework.beans.factory.annotation.Value;
 

src/name/tflucke/ieat2/errors/ResourceNotFoundException.java → src/java/name/tflucke/ieat2/server/errors/ResourceNotFoundException.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.errors;
+package name.tflucke.ieat2.server.errors;
 
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;

src/name/tflucke/ieat2/errors/ResourceWrongTypeException.java → src/java/name/tflucke/ieat2/server/errors/ResourceWrongTypeException.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.errors;
+package name.tflucke.ieat2.server.errors;
 
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;

src/name/tflucke/ieat2/models/BasicFood.java → src/java/name/tflucke/ieat2/server/models/BasicFood.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import org.mongodb.morphia.annotations.Entity;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/name/tflucke/ieat2/models/DBObject.java → src/java/name/tflucke/ieat2/server/models/DBObject.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import org.bson.types.ObjectId;
 import org.mongodb.morphia.annotations.Id;

src/name/tflucke/ieat2/models/Food.java → src/java/name/tflucke/ieat2/server/models/Food.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import java.util.Map;
 

src/name/tflucke/ieat2/models/NutrDef.java → src/java/name/tflucke/ieat2/server/models/NutrDef.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Indexed;

src/name/tflucke/ieat2/models/Recipe.java → src/java/name/tflucke/ieat2/server/models/Recipe.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import java.util.List;
 

src/name/tflucke/ieat2/models/Unit.java → src/java/name/tflucke/ieat2/server/models/Unit.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Transient;

src/name/tflucke/ieat2/models/Weight.java → src/java/name/tflucke/ieat2/server/models/Weight.java

@@ -1,4 +1,4 @@
-package name.tflucke.ieat2.models;
+package name.tflucke.ieat2.server.models;
 
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Indexed;