sync

git-svn-id: https://svn.coded.pt/svn/SIPRP@1981 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SiprpWebFichasClinicas/ant/common/evo-web-build-common.xml

@@ -20,40 +20,4 @@
     </propertyfile>
   </target>
   
-<!--   <target name="run-codegen" description="Runs codegen for this project" depends="load-properties"> -->
-<!--     <available file="${codegen.project.ant}" property="codegen.project.exists"/> -->
-<!--     <antcall target="show-codegen-project-error"/> -->
-<!--     <antcall target="run-codegen-if-project-exists"/> -->
-<!--   </target> -->
-  
-<!--   <target name="run-codegen-if-project-exists" if="codegen.project.exists"> -->
-<!--     <available file="${codegen.properties.file}" property="codegen.properties.exists"/> -->
-<!--     <antcall target="show-codegen-properties-error"/> -->
-<!--     <antcall target="run-codegen-if-exists"/> -->
-<!--   </target> -->
-  
-<!--   <target name="show-codegen-project-error" unless="codegen.project.exists"> -->
-<!--     <echo message="Codegen's build-file not found at ${codegen.project.ant}"/> -->
-<!--   </target> -->
-  
-<!--   <target name="run-codegen-if-exists" if="codegen.properties.exists"> -->
-<!--     <ant inheritall="false" antfile="${codegen.project.ant}" target="web-run"> -->
-<!--       <property name="web.run.args" value="${basedir}" /> -->
-<!--     </ant> -->
-<!--   </target> -->
-  
-<!--   <target name="show-codegen-properties-error" unless="codegen.properties.exists"> -->
-<!--     <echo message="Project's codegen configuration file not found at ${codegen.properties.file}"/> -->
-<!--   </target> -->
-  
-<!--   <target name="run-LEAF" description="Runs LEAF for this project" depends="load-properties"> -->
-<!--     <path id="leaf.classpath"> -->
-<!--       <fileset dir="${lib.tools.dir}" /> -->
-<!--       <path refid="web.build.classpath" /> -->
-<!--     </path> -->
-<!--     <java jvmversion="${web.java.version}" classname="${leaf.main}" classpathref="leaf.classpath" fork="true" dir="${web.build.dir}"> -->
-<!--       <arg value="${web.src.dir}"/> -->
-<!--     </java> -->
-<!--   </target> -->
-  
 </project>

trunk/SiprpWebFichasClinicas/ant/common/evo-web-compile-common.xml

@@ -44,7 +44,7 @@
         <exclude name="*.java" />
       </fileset>
       <fileset dir="${properties.dir}">
-        <exclude name="web.properties" />
+        <exclude name="app.properties" />
         <include name="**/*" />
       </fileset>
     </copy>
@@ -69,16 +69,15 @@
       <map from="${basedir}/" to="" />
     </pathconvert>
     <mkdir dir="${web.dist.dir}" />
-    
     <!--
     Since tomcat places the evologgerclient.jar before this jar in the 
     classpath, so the app.properties from evologgerclient.jar is always loaded 
     instead...
     -->
-    <mkdir dir="${web.build.dir}/properties"/>
+    <mkdir dir="${web.build.dir}${file.separator}properties"/>
-    <move file="${web.build.dir}/app.properties" todir="${web.build.dir}"/>
+    <move file="${web.build.dir}${file.separator}app.properties" todir="${web.build.dir}${file.separator}properties"/>
     
-    <jar destfile="${web.dist.dir}/${web.jar.name}">
+    <jar destfile="${web.dist.dir}${file.separator}${web.jar.name}">
       <fileset dir="${web.build.dir}">
         <include name="**/*" />
       </fileset>

trunk/SiprpWebFichasClinicas/ant/evo-web-build.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="evo-web-build" basedir="../" default="build-war"> 
+	<import file="common/evo-app-multiple-client-common.xml" />
+	<import file="common/evo-web-build-common.xml" />
+
+
+		<target name="build-war" depends="web-clean,web-create-jar">
+				<war destfile="${web.dist.dir}/${ant.project.name}.war" webxml="${basedir}/WebContent/WEB-INF/web.xml">
+						<fileset dir="${basedir}/WebContent">
+								<include name="**/*.*" />
+								<exclude name="WEB-INF/web.xml" />
+						</fileset>
+						<lib dir="lib"/>
+						<lib file="${web.dist.dir}/${ant.project.name}.jar"/>
+				</war>
+		</target>
+</project>

trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/InitDefaultLogger.java

@@ -1,5 +1,6 @@
 package pt.evolute.logger;
 
+import java.util.Date;
 import java.util.logging.Level;
 
 import com.evolute.utils.error.ErrorLogger;
@@ -11,10 +12,14 @@ public class InitDefaultLogger
 //		ErrorLogger.initializeLogger(StdoutLogger.LOGGER);
 		ErrorLogger.initializeLogger( new TomcatEvoLogger( Level.INFO ), true, false );
 		
+		ErrorLogger.log("LOGGING BEGIN :: "+(new Date()).toString());
+
 	}
 	
 	public void clean()
 	{
+		ErrorLogger.log("LOGGING STOP :: "+(new Date()).toString());
+		
 		ErrorLogger.stopLogger();
 	}
 }

trunk/SiprpWebFichasClinicas/src/pt/evolute/logger/TomcatEvoLogger.java

@@ -9,7 +9,7 @@ public final class TomcatEvoLogger implements Logger
 
 	private Level minLevel;
 	
-	private java.util.logging.Logger logger = java.util.logging.Logger.getLogger( "EvoLogger_SIPRP" );
+	private java.util.logging.Logger logger = java.util.logging.Logger.getLogger( "EvoLogger" );
 	
 	public TomcatEvoLogger( Level minLevel )
 	{