updating deploy task

dwildt · Dec 8, 2011 · 66ea66b · 66ea66b
1 parent 32112c9
commit 66ea66b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build
 *.class
 out
 dist
+deployid.properties
diff --git a/WebSite/formCliente.jsp b/WebSite/formCliente.jsp
@@ -6,7 +6,7 @@
 </head>
 <body bgcolor="#ffffff">
 
-<h1>Incluir Cliente</h1>
+<h1>Incluir Cliente - 005</h1>
 <f:view>
   <h:form>
     <h:panelGrid columns="3">

diff --git a/ccBuild.xml b/ccBuild.xml
@@ -1,7 +1,8 @@
-<project name="Banco" basedir="." default="emma">
+<project name="BankAccount" basedir="." default="emma">
 
   <!--  Diretorios do projeto  -->
   <property name="src.dir"            value="src"/>
+  <property name="web.dir"            value="WebSite"/>
   <property name="bin.dir"            value="WebSite/WEB-INF/classes"/>
   <property name="teste.dir"          value="test"/>
   <property name="lib.dir"            value="WebSite/WEB-INF/lib"/>
@@ -12,6 +13,9 @@
   <!-- Diretorios do JUnit-->
   <property name="junit.out.dir"       value="out/junit"/>
 
+  <!-- Diretorio para gera Deploy-->
+  <property name="dist.dir"       value="out/dist"/>
+  <property name="tomcat7.dir"       value="../lib/apache-tomcat-7.0.23/webapps"/>
 
   <!-- Diretorios do Emma -->
   <property name="emma.bin.dir"       value="out/bin"/>
@@ -23,6 +27,11 @@
 
   <!-- Flag indicando se o Emma deve ser executado -->
   <property name="emma.deveExecutar"   value="true"/>
+
+  <!-- propriedades do deploy -->
+  <touch file="deployid.properties"/>
+  <property file="deployid.properties"/>
+
 
   <!-- Classpath do projeto -->
   <path id="project.classpath">
@@ -59,6 +68,7 @@
   <target name="init">
     <delete dir="${bin.dir}"/>
     <mkdir dir="${bin.dir}"/>
+    <mkdir dir="${dist.dir}"/>
 	<mkdir dir="${emma.bin.dir}"/>
 	<mkdir dir="${emma.metadado.dir}"/>
 	<mkdir dir="${emma.relatorio.dir}"/>
@@ -167,5 +177,29 @@
             </fileset>
     </cpd>
   </target>
+
+  <!-- gera o .war e copia para a pasta dist do projeto -->  
+  <target name="war" depends="compilaSrc">  
+    <echo>gerando war file para deploy</echo>  
+    <propertyfile file="deployid.properties">
+      <entry key="build.count" default="0" type="int" operation="+" value="1" pattern="0000"/>
+    </propertyfile>
+     <property file="deployid.properties"/>
+    <war destfile="${dist.dir}/${ant.project.name}##${build.count}.war" webxml="${web.dir}/WEB-INF/web.xml">  
+        <fileset dir="${web.dir}">  
+            <include name="**/*.*"/>                
+            <exclude name="**/*web.xml"/>               
+        </fileset>  
+    </war>  
+  </target>  
+
+
+  <!-- Deploy!! Foco em Tomcat 7 -->
+  <target name="deploy" depends="testa, run-acceptance-tests, pmd, cpd, war">
+    <move todir="${tomcat7.dir}">
+       <fileset dir="${dist.dir}" includes="**/*.war"/>
+    </move>
+  </target>
 
+
 </project>
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -1,16 +1,16 @@
 deploy.ant.properties.file=/Users/dwildt/.netbeans/7.0/tomcat70.properties
-file.reference.cglib-nodep.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/cglib-nodep.jar
-file.reference.commons-lang.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/commons-lang.jar
-file.reference.DDSteps-1.1.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/DDSteps-1.1.jar
-file.reference.ehcache-constructs.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/ehcache-constructs.jar
-file.reference.ehcache.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/ehcache.jar
-file.reference.jxl.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/jxl.jar
-file.reference.spring-beans.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-beans.jar
-file.reference.spring-context.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-context.jar
-file.reference.spring-core.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-core.jar
-file.reference.spring-dao.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-dao.jar
-file.reference.spring-jdbc.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-jdbc.jar
-file.reference.spring-mock.jar=/Users/dwildt/Code/fuja/projetos/BankAccount/WebSite/WEB-INF/lib/spring-mock.jar
+file.reference.cglib-nodep.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/cglib-nodep.jar
+file.reference.commons-lang.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/commons-lang.jar
+file.reference.DDSteps-1.1.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/DDSteps-1.1.jar
+file.reference.ehcache-constructs.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/ehcache-constructs.jar
+file.reference.ehcache.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/ehcache.jar
+file.reference.jxl.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/jxl.jar
+file.reference.spring-beans.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-beans.jar
+file.reference.spring-context.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-context.jar
+file.reference.spring-core.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-core.jar
+file.reference.spring-dao.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-dao.jar
+file.reference.spring-jdbc.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-jdbc.jar
+file.reference.spring-mock.jar=/Users/dwildt/Code/BankAccount/WebSite/WEB-INF/lib/spring-mock.jar
 j2ee.server.domain=/Users/dwildt/.netbeans/7.0/apache-tomcat-7.0.11_base
 j2ee.server.home=/Applications/NetBeans/apache-tomcat-7.0.11
 j2ee.server.instance=tomcat70:home=/Applications/NetBeans/apache-tomcat-7.0.11:base=apache-tomcat-7.0.11_base