azkaban-developers

Merge pull request #215 from erwa/fix-ant Fix for issue #214:

4/9/2014 9:01:51 PM

Details

build.xml 2(+2 -0)

diff --git a/build.xml b/build.xml
index bdbc243..2e6b3ee 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,7 @@
 
   <property name="bin.dir" value="${basedir}/bin" />
   <property name="java.src.dir" value="${basedir}/src/main/java" />
+  <property name="resources.src.dir" value="${basedir}/src/main/resources" />
   <property name="dust.src.dir" value="${basedir}/src/main/tl" />
   <property name="less.src.dir" value="${basedir}/src/main/less" />
   <property name="web.src.dir" value="${basedir}/src/web" />
@@ -212,6 +213,7 @@ ${current.time}
       <fileset dir="${java.src.dir}">
         <exclude name="**/*.java" />
       </fileset>
+      <fileset dir="${resources.src.dir}"></fileset>
     </copy>
 
     <javac fork="true" destdir="${dist.classes.dir}"
diff --git a/src/main/java/azkaban/project/JdbcProjectLoader.java b/src/main/java/azkaban/project/JdbcProjectLoader.java
index 9553d48..e61c2d7 100644
--- a/src/main/java/azkaban/project/JdbcProjectLoader.java
+++ b/src/main/java/azkaban/project/JdbcProjectLoader.java
@@ -271,7 +271,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements ProjectLoad
 		}
 	}
 
-	@SuppressWarnings("resource")
 	private void uploadProjectFile(Connection connection, Project project, int version, String filetype, String filename, File localFile, String uploader) throws ProjectManagerException {
 		QueryRunner runner = new QueryRunner();
 		long updateTime = System.currentTimeMillis();
@@ -361,7 +360,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements ProjectLoad
 		return handler;
 	}
 	
-	@SuppressWarnings("resource")
 	private ProjectFileHandler getUploadedFile(Connection connection, int projectId, int version) throws ProjectManagerException {
 		QueryRunner runner = new QueryRunner();
 		ProjectVersionResultHandler pfHandler = new ProjectVersionResultHandler();