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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Ricardo Santos 11 years ago
parent 1f8fe62842
commit 7778c08d88

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry including="**/*.java" kind="src" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -53,11 +53,7 @@
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/persistence-api-1.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/policy.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/postgresql-9.3-1100-jdbc4.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-aop-3.2.5.RELEASE.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-aop-3.2.5.RELEASE.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-aspects-3.2.5.RELEASE.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-beans-3.2.5.RELEASE.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-context-3.2.5.RELEASE.jar"/>
@ -124,32 +120,32 @@
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jersey-container-servlet-core.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jersey-container-servlet.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jersey-server.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/aopalliance-repackaged-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/asm-all-repackaged-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/hk2-api-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/hk2-locator-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/hk2-utils-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javassist-3.18.1-GA.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.annotation-api-1.2.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.inject-2.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.ws.rs-api-2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxb-api-2.2.7.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jersey-guava-2.7.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/org.osgi.core-4.2.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/osgi-resource-locator-1.0.1.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/validation-api-1.1.0.Final.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-core-asl-1.9.13.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-jaxrs-1.9.13.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-xc-1.9.13.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jersey-media-json-jackson-2.7.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/htmlcompressor-1.5.3.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/persistence-api-1.0.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/spring-bridge-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/aopalliance-repackaged-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/asm-all-repackaged-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/hk2-api-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/hk2-locator-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/hk2-utils-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/javassist-3.18.1-GA.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/javax.annotation-api-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/javax.inject-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/javax.ws.rs-api-2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jaxb-api-2.2.7.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jersey-guava-2.7.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.osgi.core-4.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/osgi-resource-locator-1.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/validation-api-1.1.0.Final.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-core-asl-1.9.13.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-jaxrs-1.9.13.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-xc-1.9.13.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jersey-media-json-jackson-2.7.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/htmlcompressor-1.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/persistence-api-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-bridge-2.2.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="output" path="build"/>
</classpath>

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="SiprpWebFichasClinicas">
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib"/>
<wb-resource deploy-path="/" source-path="/WebContent/static/html"/>
<wb-resource deploy-path="/" source-path="/WebContent"/>
<dependent-module archiveName="siprp_fichasclinicas.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="SiprpWebFichasClinicas"/>
<property name="java-output-path" value="/SiprpWebFichasClinicas/build/classes"/>
</wb-module>

@ -20,4 +20,40 @@
</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>

@ -44,7 +44,7 @@
<exclude name="*.java" />
</fileset>
<fileset dir="${properties.dir}">
<exclude name="app.properties" />
<exclude name="web.properties" />
<include name="**/*" />
</fileset>
</copy>
@ -69,15 +69,16 @@
<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}${file.separator}properties"/>
<move file="${web.build.dir}${file.separator}app.properties" todir="${web.build.dir}${file.separator}properties"/>
<mkdir dir="${web.build.dir}/properties"/>
<move file="${web.build.dir}/app.properties" todir="${web.build.dir}"/>
<jar destfile="${web.dist.dir}${file.separator}${web.jar.name}">
<jar destfile="${web.dist.dir}/${web.jar.name}">
<fileset dir="${web.build.dir}">
<include name="**/*" />
</fileset>

@ -1,17 +0,0 @@
<?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>

@ -137,6 +137,7 @@ public class ProviderSpringBean {
{
url = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.DB_URL_JNLP_FULL, url );
}
System.out.println("URL::"+url);
}
private void setupProperties()

Loading…
Cancel
Save