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

trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java

@@ -368,7 +368,7 @@ public class GerirRiscosPanel extends JPanel
 		panel.add( buttonRiscoRemover );
 		panelButtons.add( panel, new TableLayoutConstraints( 0, 1 ) );
 		panel = new JPanel();
-		panel.setBorder( BorderFactory.createTitledBorder( "Medida" ) );
+		panel.setBorder( BorderFactory.createTitledBorder( "Requisito" ) );
 		panel.setLayout( new GridLayout( 2, 1 ) );
 		panel.add( buttonMedidaCriar );
 		panel.add( buttonMedidaRemover );

trunk/build.xml

@@ -43,6 +43,19 @@
 	<property name="web.xmlfile" value="web.xml" />
 	<property name="web.dependencies.chache.dir" value="${web.dir}/dependenciesCache" />
 
+	<property name="img.web.name" value="SIPRPImages" />
+	<property name="img.web.dir" value="${basedir}/WebImages" />
+	<property name="img.web.src.dir" value="${img.web.dir}/src" />
+	<property name="img.web.lib.dir" value="${app.lib.dir}" />
+	<property name="img.web.build.dir" value="${img.web.dir}/build" />
+	<property name="img.web.build.WEB-INF.dir" value="${img.web.build.dir}/WEB-INF" />
+	<property name="img.web.build.classes.dir" value="${img.web.build.WEB-INF.dir}/classes" />
+	<property name="img.web.dist.dir" value="${img.web.dir}/dist" />
+	<property name="img.web.warfile" value="${img.web.name}.war" />
+	<property name="img.web.WEB-INF.dir" value="${img.web.dir}/WEB-INF" />
+	<property name="img.web.xmlfile" value="web.xml" />
+	<property name="img.web.dependencies.chache.dir" value="${img.web.dir}/dependenciesCache" />
+
 	<!-- COMMON CLASSPATHS -->
 	<path id="common.classpath">
 		<fileset dir="${common.lib.dir}" />
@@ -91,9 +104,22 @@
 		</fileset>
 	</path>
 
-	<path id="web.build.classpath">
-		<path refid="web.jar.classpath" />
-		<pathelement location="${web.build.classes.dir}" />
+	<path id="img.web.build.classpath">
+		<path refid="img.web.jar.classpath" />
+		<pathelement location="${img.web.build.classes.dir}" />
+	</path>
+
+	<path id="img.web.jar.classpath">
+		<fileset dir="${common.lib.dir}" />
+		<fileset dir="${img.web.lib.dir}" />
+		<fileset dir="${common.lib.tools.dir}">
+			<include name="servlet-api.jar" />
+		</fileset>
+	</path>
+
+	<path id="img.web.build.classpath">
+		<path refid="img.web.jar.classpath" />
+		<pathelement location="${img.web.build.classes.dir}" />
 	</path>
 
 
@@ -257,4 +283,64 @@
 		<undeploy url="${url}" username="${username}" password="${password}" path="/${web.name}" />
 	</target>
 
+	
+	
+	<target name="img.web-prepare">
+		<mkdir dir="${img.web.build.classes.dir}" />
+		<copy todir="${img.web.build.classes.dir}">
+			<fileset dir="${img.web.src.dir}">
+				<exclude name="**/*.java" />
+				<exclude name="*.java" />
+			</fileset>
+		</copy>
+		<copy todir="${img.web.build.classes.dir}">
+			<fileset dir="${common.src.dir}">
+				<exclude name="**/*.java" />
+				<exclude name="*.java" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="img.web-build" description="Compiles all application classes" depends="img.web-prepare">
+		<depend srcdir="${img.web.src.dir}" destdir="${img.web.build.classes.dir}" cache="${img.web.dependencies.chache.dir}">
+			<include name="**/*.java" />
+		</depend>
+		<depend srcdir="${common.src.dir}" destdir="${img.web.build.classes.dir}" cache="${img.web.dependencies.chache.dir}">
+			<include name="**/*.java" />
+		</depend>
+		<javac srcdir="${common.src.dir}" destdir="${img.web.build.classes.dir}" classpathref="img.web.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" />
+		<javac srcdir="${img.web.src.dir}" destdir="${img.web.build.classes.dir}" classpathref="img.web.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" />
+	</target>
+
+	<target name="img.web-clean" description="Removes all generated files">
+		<delete failonerror="false">
+			<fileset dir="${img.web.build.dir}" />
+		</delete>
+		<delete dir="${img.web.build.dir}" failonerror="false" />
+	</target>
+
+	<target name="img.web-makeWar" depends="img.web-build">
+		<mkdir dir="${img.web.dist.dir}" />
+		<war destfile="${img.web.dist.dir}/${img.web.warfile}" webxml="${img.web.WEB-INF.dir}/${web.xmlfile}">
+			<fileset dir="${img.web.build.dir}">
+				<include name="html/**/*" />
+			</fileset>
+			<lib dir="${common.lib.dir}" />
+			<lib dir="${img.web.lib.dir}" />
+			<classes dir="${img.web.build.classes.dir}" />
+		</war>
+	</target>
+
+	<target name="img.web-tomcat-deploy" description="Install web application" depends="img.web-makeWar">
+		<deploy url="${url}" username="${username}" password="${password}" path="/${img.web.name}" war="${img.web.dist.dir}/${img.web.warfile}" />
+	</target>
+
+	<target name="img.web-tomcat-reload" description="Reload web application">
+		<reload url="${url}" username="${username}" password="${password}" path="/${img.web.name}" />
+	</target>
+
+	<target name="img.web-tomcat-undeploy" description="Remove web application">
+		<undeploy url="${url}" username="${username}" password="${password}" path="/${img.web.name}" />
+	</target>
+
 </project>