فهرست منبع

Added support for compiled client libraries in addition to raw JS.

Thomas Flucke 6 سال پیش
والد
کامیت
36454a3394
21فایلهای تغییر یافته به همراه23 افزوده شده و 10 حذف شده
  1. 23 10
      build.xml
  2. 0 0
      src/server/java/name/tflucke/ieat2/AppInitializer.java
  3. 0 0
      src/server/java/name/tflucke/ieat2/configs/DBConfig.java
  4. 0 0
      src/server/java/name/tflucke/ieat2/configs/JacksonConfig.java
  5. 0 0
      src/server/java/name/tflucke/ieat2/configs/RootConfig.java
  6. 0 0
      src/server/java/name/tflucke/ieat2/configs/WebConfig.java
  7. 0 0
      src/server/java/name/tflucke/ieat2/controllers/AbstractController.java
  8. 0 0
      src/server/java/name/tflucke/ieat2/controllers/FoodController.java
  9. 0 0
      src/server/java/name/tflucke/ieat2/controllers/NutrDefController.java
  10. 0 0
      src/server/java/name/tflucke/ieat2/controllers/UnitController.java
  11. 0 0
      src/server/java/name/tflucke/ieat2/controllers/ViewController.java
  12. 0 0
      src/server/java/name/tflucke/ieat2/controllers/WeightController.java
  13. 0 0
      src/server/java/name/tflucke/ieat2/errors/ResourceNotFoundException.java
  14. 0 0
      src/server/java/name/tflucke/ieat2/errors/ResourceWrongTypeException.java
  15. 0 0
      src/server/java/name/tflucke/ieat2/models/BasicFood.java
  16. 0 0
      src/server/java/name/tflucke/ieat2/models/DBObject.java
  17. 0 0
      src/server/java/name/tflucke/ieat2/models/Food.java
  18. 0 0
      src/server/java/name/tflucke/ieat2/models/NutrDef.java
  19. 0 0
      src/server/java/name/tflucke/ieat2/models/Recipe.java
  20. 0 0
      src/server/java/name/tflucke/ieat2/models/Unit.java
  21. 0 0
      src/server/java/name/tflucke/ieat2/models/Weight.java

+ 23 - 10
build.xml

@@ -29,13 +29,16 @@
   <property name="test.target.dir" value="${build.dir}/tests"/>
 
   <property name="source.dir" value="src/"/>
-  <property name="source.dir.java" value="${source.dir}/java"/>
-  <property name="target.dir" value="${build.dir}/${app.name}/WEB-INF/classes"/>
+  <property name="source.dir.server" value="src/server"/>
+  <property name="source.dir.server.java" value="${source.dir.server}/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>
     
@@ -112,11 +115,12 @@
           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.java}"
+  <target name="compile.server" depends="ivy.resolve.compile"
+          description="Compile server source files">
+    <mkdir dir="${target.dir.server}"/>
+	<javac srcdir="${source.dir.server.java}"
            verbose="${compile.verbose}"
-		   destdir="${target.dir}"
+		   destdir="${target.dir.server}"
 		   debug="${compile.debug}" 
 		   deprecation="${compile.deprecation}" 
 		   optimize="${compile.optimize}" 
@@ -129,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}"
@@ -149,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>

+ 0 - 0
src/java/name/tflucke/ieat2/AppInitializer.java → src/server/java/name/tflucke/ieat2/AppInitializer.java


+ 0 - 0
src/java/name/tflucke/ieat2/configs/DBConfig.java → src/server/java/name/tflucke/ieat2/configs/DBConfig.java


+ 0 - 0
src/java/name/tflucke/ieat2/configs/JacksonConfig.java → src/server/java/name/tflucke/ieat2/configs/JacksonConfig.java


+ 0 - 0
src/java/name/tflucke/ieat2/configs/RootConfig.java → src/server/java/name/tflucke/ieat2/configs/RootConfig.java


+ 0 - 0
src/java/name/tflucke/ieat2/configs/WebConfig.java → src/server/java/name/tflucke/ieat2/configs/WebConfig.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/AbstractController.java → src/server/java/name/tflucke/ieat2/controllers/AbstractController.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/FoodController.java → src/server/java/name/tflucke/ieat2/controllers/FoodController.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/NutrDefController.java → src/server/java/name/tflucke/ieat2/controllers/NutrDefController.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/UnitController.java → src/server/java/name/tflucke/ieat2/controllers/UnitController.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/ViewController.java → src/server/java/name/tflucke/ieat2/controllers/ViewController.java


+ 0 - 0
src/java/name/tflucke/ieat2/controllers/WeightController.java → src/server/java/name/tflucke/ieat2/controllers/WeightController.java


+ 0 - 0
src/java/name/tflucke/ieat2/errors/ResourceNotFoundException.java → src/server/java/name/tflucke/ieat2/errors/ResourceNotFoundException.java


+ 0 - 0
src/java/name/tflucke/ieat2/errors/ResourceWrongTypeException.java → src/server/java/name/tflucke/ieat2/errors/ResourceWrongTypeException.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/BasicFood.java → src/server/java/name/tflucke/ieat2/models/BasicFood.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/DBObject.java → src/server/java/name/tflucke/ieat2/models/DBObject.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/Food.java → src/server/java/name/tflucke/ieat2/models/Food.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/NutrDef.java → src/server/java/name/tflucke/ieat2/models/NutrDef.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/Recipe.java → src/server/java/name/tflucke/ieat2/models/Recipe.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/Unit.java → src/server/java/name/tflucke/ieat2/models/Unit.java


+ 0 - 0
src/java/name/tflucke/ieat2/models/Weight.java → src/server/java/name/tflucke/ieat2/models/Weight.java