/branches/v3/impl/build1.8.xml |
---|
New file |
0,0 → 1,960 |
<?xml version="1.0" encoding="UTF-8"?> |
<project name="estgweb" basedir="." default="help"> |
<!-- |
========================================================================================== |
ANT TASKS |
========================================================================================== |
--> |
<target name="help"> |
<echo>This is the availible Ant Tasks:</echo> |
<echo message="${env.JAVA_HOME}"></echo> |
</target> |
<!-- |
========================================================================================== |
Path libs definitions and Properties files |
========================================================================================== |
--> |
<import file="libs.xml"/> |
<!--<import file="build-web-services.xml"/>--> |
<!-- |
========================================================================================== |
General Task |
========================================================================================== |
--> |
<!--caso queiramos apagar os pregen hbm delPreGenAppScripts--> |
<!-- |
Use by hand only |
<target name="all" depends="clean,initDirs,createConfigurationFiles,generateHibernateDomainObjects,generateHibernateDaoClasses,build,generateHibernateSql,build.war,dbInit"/> |
<target name="allWebNode" depends="clean,initDirs,createConfigurationFiles,generateHibernateDomainObjects,generateHibernateDaoClasses,build.war"/> |
<target name="dataNode" depends="clean,initDirs,createConfigurationFiles,generateHibernateDomainObjects,generateHibernateDaoClasses,build,generateHibernateSql"/> |
--> |
<!-- |
========================================================================================== |
CLEAN TASKS |
========================================================================================== |
--> |
<!-- |
<target name="clean" description="clean *.class and build dir"> |
<delete dir="${build.dir}"/> |
<delete dir="${dist.dir}"/> |
<delete> |
<fileset dir="${gen.dir.java}"> |
<exclude name="pt/ipportalegre/**/*.*"/> |
<exclude name="pt/estgp/estgweb/services/directories/**/*.*"/> |
<include name="**/*.java"/> |
</fileset> |
</delete> |
<sleep seconds="5"/> |
</target> |
--> |
<!-- |
========================================================================================== |
CREATE-DIRS |
========================================================================================== |
--> |
<target name="initDirs"> |
<mkdir dir="${log.dir}"/> |
<mkdir dir="${data.dir}"/> |
<mkdir dir="${build.dir}"/> |
<mkdir dir="${build.dir.classes}"/> |
<mkdir dir="${build.dir.war}"/> |
<mkdir dir="${build.dir.ws}"/> |
<mkdir dir="${build.dir.scripts}"/> |
<delete dir="${dist.dir}"/> |
<mkdir dir="${dist.dir}"/> |
<mkdir dir="${gen.dir.java}"/> |
</target> |
<!-- |
========================================================================================== |
Tomcat Tasks |
========================================================================================== |
--> |
<taskdef name="tomcat.reload" classname="org.apache.catalina.ant.ReloadTask" classpathref="pathToToolsLib"/> |
<!--<taskdef name="tomcat.remove" classname="org.apache.catalina.ant.RemoveTask" classpathref="pathToToolsLib"/>--> |
<!--<taskdef name="tomcat.roles" classname="org.apache.catalina.ant.RolesTask" classpathref="pathToToolsLib"/>--> |
<taskdef name="tomcat.start" classname="org.apache.catalina.ant.StartTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.stop" classname="org.apache.catalina.ant.StopTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.undeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.deploy" classname="org.apache.catalina.ant.DeployTask" classpathref="pathToToolsLib"/> |
<!--<taskdef name="tomcat.install" classname="org.apache.catalina.ant.InstallTask" classpathref="pathToToolsLib"/>--> |
<taskdef name="tomcat.jasper" classname="org.apache.jasper.JspC"> |
<classpath id="jspc.classpath"> |
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> |
<fileset dir="${tomcat.home}/bin"> |
<include name="*.jar"/> |
</fileset> |
<fileset dir="${tomcat.libs.common.home}"> |
<include name="*.jar"/> |
</fileset> |
<fileset dir="${tomcat.libs.ant.home}"> |
<include name="*.jar"/> |
</fileset> |
</classpath> |
</taskdef> |
<!-- |
TOMCAT Instalation Tasks |
--> |
<!--<target name="tomcat.deployContext" depends="build.war"> |
<echo message="${tomcat.manager}"/> |
<tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
config="file://${basedir}/${dist.dir}/estgweb.xml" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target>--> |
<!-- |
<target name="tomcat.deployContextOnly" depends=""> |
<echo message="${tomcat.manager}"/> |
<tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
config="file://${basedir}/${dist.dir}/estgweb.xml" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.redeployContext" depends="tomcat.undeploy,build.war" > |
<echo message="${tomcat.manager}"/> |
<tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
config="file:${basedir}/${dist.dir}/estgweb.xml" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target>--> |
<target name="tomcat.deploy" depends="war" > |
<echo message="${tomcat.manager} path:${tomcat.context.path.install} warfile:file:${basedir}/${dist.dir}/${tomcat.war.file}"/> |
<tomcat.deploy url="${tomcat.manager}" path="${tomcat.context.path.install}" |
war="file:${basedir}/${dist.dir}/${tomcat.war.file}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.redeploy" depends="tomcat.undeploy,war"> |
<echo message="${tomcat.manager} path:${tomcat.context.path.install} warfile:file:${basedir}/${dist.dir}/${tomcat.war.file}"/> |
<tomcat.deploy url="${tomcat.manager}" path="${tomcat.context.path.install}" |
war="file:${basedir}/${dist.dir}/${tomcat.war.file}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.undeploy"> |
<echo message="${tomcat.manager}"/> |
<tomcat.undeploy url="${tomcat.manager}" path="${tomcat.context.path.install}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.reload"> |
<echo message="${tomcat.manager}"/> |
<tomcat.reload url="${tomcat.manager}" path="${tomcat.context.path.install}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.start"> |
<echo message="${tomcat.manager}"/> |
<tomcat.start url="${tomcat.manager}" path="${tomcat.context.path.install}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<target name="tomcat.stop"> |
<echo message="${tomcat.manager}"/> |
<tomcat.stop url="${tomcat.manager}" path="${tomcat.context.path.install}" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
<!-- |
========================================================================================== |
BUILD TASKS, Have no effect now, no revengstrategy defined.... |
========================================================================================== |
--> |
<target name="build" depends="initDirs" description="Compile All and create conf files"> |
<antcall target="compile"/> |
<antcall target="createConfigurationFiles"/> |
<antcall target="generateJsonJspsFile"/> |
<antcall target="generateJsonSoaServicesFile"/> |
</target> |
<target name="compile" depends="initDirs" description="Compile All"> |
<javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
<!--<compilerarg line="-Xlint:deprecation" />--> |
<src path="${src.dir}"/> |
<src path="${gen.dir.java}"/> |
<classpath refid="pathToToolsLib"/> |
</javac> |
</target> |
<target name="compileToolFiles" description="Compile Mappings Builder"> |
<javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" srcdir="${src.dir}" debug="true" optimize="true" deprecation="true" verbose="true" failonerror="true"> |
<include name="${mapping.buider.class.file}"/> |
<include name="${scripts.buider.class.file}"/> |
<include name="${jsp.interfaces.web.json.class.file}"/> |
<classpath refid="pathToToolsLib"/> |
</javac> |
</target> |
<!-- |
Build distribution files |
--> |
<target name="dist" depends="build"> |
<jar jarfile="${dist.dir}/estgweb.jar"> |
<fileset dir="${build.dir.classes}" includes="**/*.class"/> |
</jar> |
<copy overwrite="true" todir="${dist.dir}"> |
<fileset dir="${build.dir.classes}" includes="**/*.properties"/> |
<fileset dir="${build.dir.classes}" includes="**/*.xml"/> |
<fileset dir="${build.dir.classes}" includes="**/*.gif"/> |
<fileset dir="${build.dir.classes}" includes="**/*.xsd"/> |
<fileset dir="${build.dir.classes}" includes="**/*.xsl"/> |
</copy> |
<copy overwrite="true" todir="${dist.dir}" file="${conf.dir}/tomcat/estgweb.xml"/> |
<replace file="${dist.dir}/estgweb.xml" value=""> |
<replacefilter token="@build.dir.war@" value="${basedir}${file.separator}build${file.separator}ant${file.separator}war${file.separator}"/> |
<replacefilter token="@context.path@" value="${tomcat.context.path}"/> |
</replace> |
</target> |
<target name="copy.jsps.war" depends="createConfigurationFiles" description="copy only jsps to war distribution"> |
<copy todir="${build.dir.war}" overwrite="false"> |
<fileset dir="src/web"> |
<include name="**/*"/> |
</fileset> |
</copy> |
<copy todir="${build.dir.war}/WEB-INF/tags" overwrite="false"> |
<fileset dir="${conf.dir}/WEB-INF/tags"> |
<include name="**/*"/> |
</fileset> |
</copy> |
<copy todir="${build.dir.war}/WEB-INF/classes" overwrite="false"> |
<fileset dir="${build.dir.classes}"> |
<include name="**/*.xsl"/> |
</fileset> |
</copy> |
<replace file="${build.dir.war}/css/style.css"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
<replace file="${build.dir.war}/css/intranet.css"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
<replace file="${build.dir.war}/js/ajax.js"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
</target> |
<target name="build.war" depends="dist" description="Make war distribution"> |
<mkdir dir="${build.dir.war}"/> |
<mkdir dir="${build.dir.war}/WEB-INF"/> |
<mkdir dir="${build.dir.war}/WEB-INF/lib"/> |
<copy todir="${build.dir.war}/WEB-INF/lib"> |
<fileset dir="${common.lib.dir}/log4j"> |
<include name="*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/berserk"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/hibernate"> |
<include name="**/*.jar"/> |
<exclude name="xerces-2.6.2.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/log4j"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/mysql"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/oracle"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/commons"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/struts"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/ldap"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/mail"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/jfreechart1019"> |
<include name="**/*.jar"/> |
<exclude name="servlet.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/lucene"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/jaxrpc"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/saxon"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/fop"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/itextpdf"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/json"> |
<include name="**/*.jar"/> |
<exclude name="genson-0.97.jar"/> |
<!--<exclude name="genson-1.4.jar"/>--> |
</fileset> |
<fileset dir="${common.lib.dir}/jsoup"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/simplexml"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/poi"> |
<include name="**/*.jar"/> |
</fileset> |
<fileset dir="${common.lib.dir}/reflections"> |
<include name="**/*.jar"/> |
</fileset> |
</copy> |
<copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
<copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
<fileset dir="${conf.dir}/WEB-INF"> |
<include name="**/*.*"/> |
</fileset> |
</copy> |
<mkdir dir="${build.dir.war}/WEB-INF/classes"/> |
<copy todir="${build.dir.war}/WEB-INF/classes" overwrite="true"> |
<fileset dir="${build.dir.classes}"> |
<include name="**/*.types"/> |
<include name="**/*.properties"/> |
<include name="**/*.txt"/> |
<include name="**/*.xml"/> |
<include name="**/*.gif"/> |
<include name="**/*.png"/> |
<include name="**/*.exe"/> |
<include name="**/*.xsl"/> |
<include name="**/*.xsd"/> |
<include name="**/*.json"/> |
</fileset> |
</copy> |
<copy todir="${build.dir.war}" overwrite="true"> |
<fileset dir="src/web"> |
<include name="**/*"/> |
</fileset> |
</copy> |
<mkdir dir="${build.dir.war}/docs"/> |
<!--DOCUMENTOS IMPORTANTES ARQUITETURA EMPRESARIAL TODO REVER LOCALIZAÇÃO DOS MESMOS--> |
<copy todir="${build.dir.war}/docs" overwrite="true" file="src/doc/siges/ModeloDeInformacaoPAE-EmVigor.docx"/> |
<copy todir="${build.dir.war}/docs" overwrite="false" file="src/doc/siges/Modelo_de_Dados_Siges11.zip"/> |
<copy todir="${build.dir.war}/docs" overwrite="true" file="src/doc/BacoV32016/processos/DocumentacaoProcessos.doc"/> |
<replace file="${build.dir.war}/js/ajax.js"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
<replace file="${build.dir.war}/css/style.css"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
<replace file="${build.dir.war}/css/intranet.css"> |
<replacefilter token="@contextPath@" value="${tomcat.context.path}"/> |
</replace> |
</target> |
<target name="jasper" depends="copy.jsps.war"> |
<delete dir="${build.dir.jsp}"/> |
<mkdir dir="${build.dir.jsp}"/> |
<tomcat.jasper compilersourcevm="1.8" compilertargetvm="1.8" validateXml="false" uriroot="${build.dir.war}" webXmlFragment="${build.dir.war}/WEB-INF/generated_web.xml" addWebXmlMappings="true" outputDir="${build.dir.jsp}" /> |
<javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.war}/WEB-INF/classes" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
<compilerarg line="-Xlint:deprecation" /> |
<!--<compilerarg line="-Xlint:unchecked" />--> |
<src path="${build.dir.jsp}"/> |
<src path="${build.dir}/"/> |
<classpath path="${build.dir.classes}"/> |
<classpath refid="pathToToolsLib"/> |
</javac> |
<delete> |
<fileset dir="${build.dir.war}"> |
<include name="**/*.jsp"/> |
</fileset> |
</delete> |
<delete> |
<fileset dir="${build.dir.war}/WEB-INF/tags"> |
<include name="**/*.jsp"/> |
</fileset> |
</delete> |
</target> |
<target name="war" depends="build.war"> |
<delete file="${dist.dir}/${tomcat.war.file}"/> |
<jar destfile="${dist.dir}/${tomcat.war.file}"> |
<fileset dir="${build.dir.war}"> |
<include name="**/*" /> |
</fileset> |
</jar> |
</target> |
<target name="war.jasper" depends="build.war,jasper"> |
<delete file="${dist.dir}/${tomcat.war.file}"/> |
<jar destfile="${dist.dir}/${tomcat.war.file}"> |
<fileset dir="${build.dir.war}"> |
<include name="**/*" /> |
</fileset> |
</jar> |
</target> |
<!-- |
========================================================================================== |
Generate Configuration Files TASKS |
========================================================================================== |
--> |
<target name="createConfigurationFiles" depends="compileToolFiles,copyConfigurationFiles,replaceFiltersConfigurationFiles,generateHibernateCfgXml"/> |
<target name="copyConfigurationFiles"> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${hbm.dir}" includes="**/*.hbm.xml"/> |
</copy> |
<mkdir dir="${build.dir.classes}/template/xsd"/> |
<copy todir="${build.dir.classes}/template/xsd" overwrite="true"> |
<fileset dir="${src.xsd}"> |
<include name="**/*.xsl"/> |
<include name="**/*.xsd"/> |
</fileset> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.json"/> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.xsl"/> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.gif"/> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.png"/> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.csv"/> |
</copy> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${conf.dir}/berserk" includes="*.*"/> |
</copy> |
<mkdir dir="${email.templates.dir.build}"/> |
<copy overwrite="true" todir="${email.templates.dir.build}"> |
<fileset dir="${email.templates.dir.conf}" includes="*.*"/> |
</copy> |
<mkdir dir="${sms.templates.dir.build}"/> |
<copy overwrite="true" todir="${sms.templates.dir.build}"> |
<fileset dir="${sms.templates.dir.conf}" includes="*.*"/> |
</copy> |
<mkdir dir="${assignement.templates.dir.build}"/> |
<copy overwrite="true" todir="${assignement.templates.dir.build}"> |
<fileset dir="${assignement.templates.dir.conf}" includes="*.*"/> |
</copy> |
<!--<copy overwrite="true" todir="${olap.cfg.xml.build}" file="${olap.cfg.xml}"/>--> |
<copy overwrite="true" todir="${hibernate.cfg.xml.build}" file="${hibernate.cfg.xml}"/> |
<copy overwrite="true" todir="${mime.types.build}" file="${mime.types}"/> |
<copy overwrite="true" todir="${app.properties.build}" file="${app.properties}"/> |
<copy overwrite="true" todir="${ldap.properties.build}" file="${ldap.properties}"/> |
<copy overwrite="true" todir="${jdbc.properties.build}" file="${jdbc.properties}"/> |
<copy overwrite="true" todir="${jdbc.olap.properties.build}" file="${jdbc.olap.properties}"/> |
<copy overwrite="true" todir="${ldap.properties.build}" file="${ldap.properties}"/> |
<copy overwrite="true" todir="${build.dir.classes}" file="${log4j.properties}"/> |
<mkdir dir="${build.dir.intranet.setup.folders.file}"/> |
<copy overwrite="true" todir="${build.dir.intranet.setup.folders.file}" file="${intranet.setup.folders.file.src}"/> |
<mkdir dir="${build.dir.classes}/pt/estgp/estgweb/directories"/> |
<copy overwrite="true" todir="${build.dir.classes}/pt/estgp/estgweb/directories"> |
<fileset dir="${conf.dir}/directories" includes="*.*"/> |
</copy> |
<!--<java classname="${scripts.buider.class}" classpath="${build.dir.classes}">--> |
<!--<arg value="${basedir}${file.separator}..${file.separator}common"/>--> |
<!--<arg value="${basedir}${file.separator}build${file.separator}ant${file.separator}classes"/>--> |
<!--<arg value="${build.dir.scripts}"/>--> |
<!--<arg value="${scripts.target.libs.file}"/>--> |
<!--</java>--> |
<!--<copy overwrite="true" todir="${build.dir.scripts}">--> |
<!--<fileset dir="${src.scripts}" includes="*.*"/>--> |
<!--</copy>--> |
</target> |
<target name="copyXslFiles"> |
<copy overwrite="true" todir="${build.dir.classes}"> |
<fileset dir="${src.dir}" includes="**/*.xsl"/> |
</copy> |
</target> |
<target name="replaceFiltersConfigurationFiles"> |
<delete file="${build.dir.classes}/MessageResources.properties"/> |
<!--<concat encoding="ISO-8859-1" destfile="${build.dir.classes}/MessageResources.properties" append="true"> |
<fileset dir="${conf.dir}/language"> |
<include name="*.properties" /> |
</fileset> |
</concat>--> |
<copy todir="${build.dir.classes}"> |
<fileset dir="${conf.dir}/language"> |
<include name="*.properties" /> |
</fileset> |
</copy> |
<replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
</replace> |
<replace file="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
</replace> |
<replace file="${hibernate.cfg.xml.build}/${hibernate.cfg.xml.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
<replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
</replace> |
<!-- |
<replace file="${olap.cfg.xml.build}/${olap.cfg.xml.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
<replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
</replace>--> |
<replace file="${app.properties.build}/app.properties"> |
<replacefilter token="@google.recaptcha.secret.key@" value="${google.recaptcha.secret.key}"/> |
<replacefilter token="@admin.email.1@" value="${admin.email.1}"/> |
<replacefilter token="@admin.email.2@" value="${admin.email.2}"/> |
<replacefilter token="@tmp.dir@" value="${tmp.dir}"/> |
<replacefilter token="@data.dir@" value="${data.dir}"/> |
<replacefilter token="@out.dir@" value="${out.dir}"/> |
<replacefilter token="@email.templates.dir@" value="${email.templates.dir}"/> |
<replacefilter token="@use.ldap@" value="${use.ldap}"/> |
<replacefilter token="@site.url@" value="${site.url}"/> |
<!-- DONT USE ANY MORE NOW IS IN CONFIGURATION DAO <replacefilter token="@ws.siges.wsdl@" value="${ws.siges.wsdl}"/>--> |
<replacefilter token="@ws.siges.target.namespace@" value="${ws.siges.target.namespace}"/> |
<replacefilter token="@intranet.setup.folders.file@" value="${build.dir.relative.intranet.setup.folders.file}"/> |
<replacefilter token="@intranet.setup.folders.filename@" value="${intranet.setup.folders.filename}"/> |
<replacefilter token="@oracle.siges.url@" value="${oracle.siges.url}"/> |
<replacefilter token="@oracle.siges.username@" value="${oracle.siges.username}"/> |
<replacefilter token="@oracle.siges.password@" value="${oracle.siges.password}"/> |
<!--System instance type specifications--> |
<replacefilter token="@email.password@" value="${email.password}"/> |
<replacefilter token="@email.user.sufix@" value="${email.user.sufix}"/> |
<replacefilter token="@email.user.count@" value="${email.user.count}"/> |
<replacefilter token="@email.use.round.robin@" value="${email.use.round.robin}"/> |
<replacefilter token="@email.use.security@" value="${email.use.security}"/> |
<replacefilter token="@email.user.prefix@" value="${email.user.prefix}"/> |
<replacefilter token="@email.from@" value="${email.from}"/> |
<replacefilter token="@email.server@" value="${email.server}"/> |
<replacefilter token="@test.control.var@" value="${test.control.var}"/> |
<replacefilter token="@mode.pae.enabled@" value="${mode.pae.enabled}"/> |
<replacefilter token="@system.theme@" value="${system.theme}"/> |
<replacefilter token="@authentication.policy.service@" value="${authentication.policy.service}"/> |
<replacefilter token="@authentication.policy.username.msg.key@" value="${authentication.policy.username.msg.key}"/> |
<replacefilter token="@authentication.policy.password.msg.key@" value="${authentication.policy.password.msg.key}"/> |
<replacefilter token="@system.redirections.policy.index.welcome@" value="${system.redirections.policy.index.welcome}"/> |
<replacefilter token="@system.redirections.policy.authentication.action@" value="${system.redirections.policy.authentication.action}"/> |
<replacefilter token="@system.redirections.policy.authentication.logout.action@" value="${system.redirections.policy.authentication.logout.action}"/> |
<replacefilter token="@system.mail.standard.certificated.home.page@" value="${system.mail.standard.certificated.home.page}"/> |
<replacefilter token="@system.intranet.url@" value="${system.intranet.url}"/> |
<replacefilter token="@system.public.url@" value="${system.public.url}"/> |
<replacefilter token="@ionline.user@" value="${ionline.user}"/> |
<replacefilter token="@ionline.pass@" value="${ionline.pass}"/> |
</replace> |
<replace file="${ldap.properties.build}/ldap.properties"> |
<replacefilter token="@ldap.queries.login@" value="${ldap.queries.login}"/> |
<replacefilter token="@ldap.queries.password@" value="${ldap.queries.password}"/> |
</replace> |
<replace file="${build.dir.classes}/${log4j.properties.filename}"> |
<replacefilter token="@log.file@" value="${log.file}"/> |
<replacefilter token="@log.level@" value="${log.level}"/> |
</replace> |
<!--<replace file="${build.dir.scripts}/${scripts.setenv.file}"> |
<replacefilter token="@tomcat.home@" value="${tomcat.home}"/> |
</replace>--> |
<replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
</replace> |
<replace file="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}"> |
<replacefilter token="@database.username@" value="${database.username}"/> |
<replacefilter token="@database.password@" value="${database.password}"/> |
<replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
</replace> |
</target> |
<target name="generateHibernateCfgXml" depends="compileToolFiles"> |
<!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
<java classname="${mapping.buider.class}" classpath="${build.dir.classes}"> |
<arg value="${hibernate.cfg.xml.build}"/> |
<arg value="${hibernate.cfg.xml}"/> |
<arg value="${package.dir}"/> |
<!--<arg value="Olap"/> O Hibernate.cfg serve para tudo no entanto o schema update e feito |
<arg value="false"/> com o jdbc.olap para que estas tabelas fiquem como MyISAM |
--> |
</java> |
<!--<echo message="Starting OLAP"/> |
<java classname="${mapping.buider.class}" classpath="${build.dir.classes}"> |
<arg value="${olap.cfg.xml.build}"/> |
<arg value="${olap.cfg.xml}"/> |
<arg value="${package.dir}"/> |
<arg value="Olap"/> |
<arg value="true"/> |
</java>--> |
<antcall target="replaceFiltersConfigurationFiles"/> |
</target> |
<target name="dbInit"> |
<!--<delete file="${build.dir.classes}/${olap.cfg.xml.filename}"/>--> |
<!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
<java classname="pt.estgp.estgweb.examples.DBInit" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
<antcall target="replaceFiltersConfigurationFiles"/> |
</target> |
<!-- |
Hibernate Tools Task |
--> |
<taskdef name="hibernatetool" |
classname="org.hibernate.tool.ant.HibernateToolTask" |
classpathref="pathToToolsLib" classpath="${build.dir.classes}"/> |
<!-- |
========================================================================================== |
GENERATE SQL SCRIPTS |
========================================================================================== |
--> |
<taskdef name="schemaexport" |
classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" |
classpathref="pathToToolsLib" classpath="${build.dir.classes}"/> |
<!-- |
<target name="generateHibernateSql" depends="build"> |
<schemaexport |
properties="${jdbc.properties.build}/${jdbc.properties.filename}" |
quiet="no" |
text="no" |
drop="no" |
delimiter=";" |
output="${build.dir.classes}/app-scripts.sql"> |
<fileset dir="${hbm.dir}"> |
<include name="**/*.hbm.xml"/> |
<exclude name="**/Olap*.hbm.xml"/> |
</fileset> |
</schemaexport> |
<schemaexport |
properties="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}" |
quiet="no" |
text="no" |
drop="no" |
delimiter=";" |
output="${build.dir.classes}/app-scripts.sql"> |
<fileset dir="${hbm.dir}"> |
<include name="**/Olap*.hbm.xml"/> |
</fileset> |
</schemaexport> |
</target>--> |
<target name="generateUpdateHibernateSql" depends="build"> |
<!--<taskdef name="schemaupdate" |
classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" |
classpathref="pathToToolsLib" classpath="${build.dir.classes}"/>--> |
<taskdef name="schemaupdate" |
classname="jomm.dao.utils.JommSchemaUpdateTask" |
classpathref="pathToToolsLib" classpath="${build.dir.classes}"/> |
<schemaupdate |
properties="${jdbc.properties.build}/${jdbc.properties.filename}" |
quiet="false" |
text="false"> |
<fileset dir="${hbm.dir}"> |
<include name="**/*.hbm.xml"/> |
<!--<exclude name="**/Olap*.hbm.xml"/>--> |
</fileset> |
</schemaupdate> |
<!-- |
<schemaupdate |
properties="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}" |
quiet="no" |
text="no"> |
<fileset dir="${hbm.dir}"> |
<include name="**/Olap*.hbm.xml"/> |
</fileset> |
</schemaupdate>--> |
</target> |
<!-- |
Esta tarefa compila todas as classes necessarias para que os enhanced types seja bem gerados |
Para que tudo corra bem é necessario que os pacotes pt.estgp.estgweb.utils jomm.utils e pt.estgp.estgweb.domain.gentypes sejam 100% coesos |
com zero referências ao exterior. Esta modificação foi feita na versão 1812 |
Classes que necessitem de serviços ou outros tipos que ainda não foram compilados |
os seus enhanced's devem usar o meta atributo no mapeamento do hibernate |
exemplo |
<property name="repositoryFileProxy" |
type="pt.estgp.estgweb.domain.typegenservices.repositorydocuments.EnhancedRepositoryFileProxy"> |
<meta attribute="property-type">pt.estgp.estgweb.domain.typegenservices.repositorydocuments.RepositoryFileProxy</meta> |
<column name="repositoryStream" sql-type="VARCHAR(255)"/> |
</property> |
--> |
<target name="compileUtils" depends="initDirs"> |
<javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
<compilerarg line="-Xlint:deprecation" /> |
<src path="${src.dir}/pt/estgp/estgweb/utils"/> |
<src path="${src.dir}/jomm/utils"/> |
<classpath refid="pathToToolsLib"/> |
</javac> |
</target> |
<target name="compileEnhancedTypes" depends="compileUtils"> |
<javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
<compilerarg line="-Xlint:deprecation" /> |
<src path="${src.dir}/pt/estgp/estgweb/domain/typesgen"/> |
<classpath refid="pathToToolsLib"/> |
</javac> |
</target> |
<target name="generateHibernateDomainObjects" > |
<!--<echo message="SE NAO COMPILOU AS ENHANCED CLASSES COMPILE PRIMEIRO POR FAVOR"></echo> |
<sleep milliseconds="5000"> |
</sleep>--> |
<replace dir="${hbm.dir}" value=""> |
<include name="**/*.hbm.xml"/> |
<replacefilter token='<timestamp source="db"' value="<timestamp"/> |
</replace> |
<hibernatetool> |
<configuration> |
<fileset dir="${hbm.dir}"> |
<include name="**/*.hbm.xml"/> |
</fileset> |
</configuration> |
<hbm2java |
jdk5="true" |
ejb3="false" |
destdir="${gen.dir.java}"/> |
</hibernatetool> |
<delete> |
<fileset dir="${gen.dir.java}"> |
<include name="**/*Impl.java"/> |
</fileset> |
</delete> |
<replace dir="${hbm.dir}" value=""> |
<include name="**/*.hbm.xml"/> |
<replacefilter token='<timestamp' value='<timestamp source="db"'/> |
</replace> |
</target> |
<!-- |
========================================================================================== |
GENERATE DAO IMPLEMENTATION |
========================================================================================== |
--> |
<target name="generateHibernateDaoClasses"> |
<hibernatetool destdir="${gen.dir.java}" > |
<configuration> |
<fileset dir="${hbm.dir}"> |
<include name="**/*.hbm.xml"/> |
</fileset> |
</configuration> |
<hbmtemplate |
filepattern="{class-name}${dao.file.pattern}.java" |
templatepath="${dao.template.dir}" |
template="${dao.impl.template}" |
destdir="${dao.impl.package.dir}"> |
<property key="jdk5" value="true"/> |
<property key="ejb3" value="false"/> |
<property key="dao" value="${dao.file.pattern}"/> |
<property key="daoDomainPackage" value="${domain.package}"/> |
<property key="daoInterfacesPackage" value="${dao.interfaces.package}"/> |
<property key="daoImplPackage" value="${dao.impl.package}"/> |
</hbmtemplate> |
</hibernatetool> |
<delete> |
<fileset dir="${gen.dir.java}"> |
<include name="**/*ImplDao.java"/> |
</fileset> |
</delete> |
</target> |
<!-- |
========================================================================================== |
Generate Hibernate UML Diagrams |
========================================================================================== |
<property name="doc" location="build/ant/diagrams"/> |
<property name="dot.exe" location="/usr/local/bin/dot" /> |
<taskdef |
name="hbm2gif" |
classname="com.oy.shared.lm.ant.HBMtoGIFTask" |
classpathref="pathToToolsLib" |
/> |
<target name="generateHibernateUmlDiagram" depends="initDirs"> |
<mkdir dir="${doc}"/> |
<hbm2gif |
caption="XML file for launching Catalina 5.0.25 applications using Apache Ant." |
colors="cyan, lightcyan, orange, black, black" |
inFile="${hbm.dir}/pt/estgp/estgweb/domain/CourseUnit.hbm.xml" |
dotFile="${doc}/CourseUnit.dot" |
outFile="${doc}/CourseUnit.gif" |
exeFile="${dot.exe}" |
/> |
</target> |
--> |
<!-- |
========================================================================================== |
GENERATE WEBSERVICES JAXWS |
========================================================================================== |
--> |
<target name="ws.generate-siges-client" depends="initDirs"> |
<taskdef name="wsimport2" classname="com.sun.tools.ws.ant.WsImport" |
classpathref="pathToToolsLib"> |
</taskdef> |
<copy file="${ws.client.binding.dir}/${ws.siges.binding.file}" todir="${build.dir.ws}" overwrite="true"/> |
<replace file="${build.dir.ws}/${ws.siges.binding.file}" encoding="UTF-8"> |
<replacefilter token="@wsdl.client@" value="${ws.siges.wsdl}"/> |
<replacefilter token="@target.namespace@" value="${ws.siges.target.namespace}"/> |
<replacefilter token="@ws.package@" value="${ws.siges.package}"/> |
</replace> |
<!--xendorsed="true"--> |
<wsimport2 |
debug="${ws.debug}" |
verbose="${ws.verbose}" |
keep="${ws.keep}" |
extension="${ws.extension}" |
destdir="${gen.dir.java}" |
wsdl="${ws.siges.wsdl}"> |
<binding dir="${build.dir.ws}" includes="${ws.client.binding.file}"/> |
</wsimport2> |
<delete> |
<fileset dir="${gen.dir.java}"> |
<include name="**/*.class"/> |
</fileset> |
</delete> |
</target> |
<!-- |
========================================================================================== |
GENERATE A LIST OF ALL JSP's FILES IN JSON |
========================================================================================== |
--> |
<target name="generateJsonJspsFile" > |
<java classname="${jsp.interfaces.web.json.class}" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="${build.dir.classes}"/> |
<arg value="${src.web}"/> |
<arg value="/user;/admin;/public"/> |
</java> |
</target> |
<target name="generateJsonSoaServicesFile" > |
<java fork="true" classname="${soa.services.json.class}" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="${build.dir.classes}"/> |
<arg value="${basedir}/${src.dir}/"/> |
</java> |
</target> |
<!-- |
========================================================================================== |
DIRECTORIES + STUDIES PLANS XSD JAXB |
========================================================================================== |
--> |
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="pathToToolsLib"> |
</taskdef> |
<target name="directories-gen-jaxb" depends="initDirs"> |
<xjc destdir="${gen.dir.java}" package="pt.estgp.estgweb.services.directories.xsd"> |
<schema dir="${conf.dir}/directories" includes="directory.xsd"/> |
</xjc> |
<replace dir="${gen.dir.java}/pt/estgp/estgweb/services/directories/xsd" value=""> |
<include name="*.java"/> |
<replacefilter token="public Boolean is" value="public Boolean get"/> |
</replace> |
</target> |
<target name="studies-plan-gen-jaxb" depends="initDirs"> |
<xjc destdir="${gen.dir.java}" package="pt.estgp.estgweb.services.courses.xsd"> |
<schema dir="src/xsd" includes="planoestudos.xsd"/> |
</xjc> |
<replace dir="${gen.dir.java}/pt/estgp/estgweb/services/courses/xsd" value=""> |
<include name="*.java"/> |
<replacefilter token="public Boolean is" value="public Boolean get"/> |
</replace> |
</target> |
<!-- |
========================================================================================== |
DEAMONS |
========================================================================================== |
--> |
<!--<target name="run">--> |
<!--<java classname="mitra.oaiharvest.harvest.HarvestEngine" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>--> |
<!--<java classname="mitra.oaiharvest.index.IndexEngine" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>--> |
<!--</target>--> |
<target name="util.task.createRepositoryXML"> |
<java classname="pt.estgp.estgweb.services.data.CreateDescriptionsXML" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="util.task.reset.urlsstats"> |
<java classname="pt.estgp.estgweb.services.urlstat.ResetRelativePathsService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="util.task.reset.urlsstats.digests"> |
<java classname="pt.estgp.estgweb.services.urlstat.ResetRelativePathsServiceDigests" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="CourseUnitsStatisticsJobService"> |
<java classname="pt.estgp.estgweb.services.courses.CourseUnitsStatisticsJobService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="RUNReportQuestionariosGeneratorTest" depends="compile,copyXslFiles"> |
<java fork="true" jvmargs="-Dfile.encoding=UTF-8" classname="pt.estgp.estgweb.services.questionarios.pedagogico.reportprocessors.DocenteReportGenerator" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="RUNZipFolderAdHoc"> |
<java fork="true" jvmargs="-Dfile.encoding=UTF-8" classname="pt.estgp.estgweb.services.questionarios.pedagogico.reportprocessors.utils.ZipFolderForReportDocente" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
</target> |
<target name="print-version"> |
<echo>Java/JVM version: ${ant.java.version}</echo> |
<echo>Java/JVM detail version: ${java.version}</echo> |
</target> |
</project> |
/branches/v3/impl/conf/WEB-INF/web.xml |
---|
12,6 → 12,10 |
</listener> |
--> |
<filter> |
<filter-name>UrlDisplayFilter</filter-name> |
<filter-class>pt.estgp.estgweb.web.filters.UrlDisplayFilter</filter-class> |
</filter> |
<filter> |
<filter-name>CacheControlFilter</filter-name> |
<filter-class>pt.estgp.estgweb.web.filters.CacheControlFilter</filter-class> |
</filter> |
73,6 → 77,10 |
</filter> |
<filter-mapping> |
<filter-name>UrlDisplayFilter</filter-name> |
<url-pattern>/*</url-pattern> |
</filter-mapping> |
<filter-mapping> |
<filter-name>CacheControlFilter</filter-name> |
<url-pattern>/*</url-pattern> |
</filter-mapping> |
/branches/v3/impl/conf/WEB-INF/tags/repositoryFile.tag |
---|
1,8 → 1,8 |
<%@ tag import="jomm.dao.impl.AbstractDao" %> |
<%@ tag import="pt.estgp.estgweb.filters.filters.ResourceAccessControl" %> |
<%@ tag import="pt.estgp.estgweb.services.data.IRepositoryFile" %> |
<%@ tag import="pt.estgp.estgweb.services.data.RepositoryService" %> |
<%@ tag import="pt.estgp.estgweb.web.UserSessionProxy" %> |
<%@tag import="jomm.dao.impl.AbstractDao" %> |
<%@tag import="pt.estgp.estgweb.filters.filters.ResourceAccessControl" %> |
<%@tag import="pt.estgp.estgweb.services.data.IRepositoryFile" %> |
<%@tag import="pt.estgp.estgweb.services.data.RepositoryService" %> |
<%@tag import="pt.estgp.estgweb.web.UserSessionProxy" %> |
<%@tag description="Repository File Tag for Download" pageEncoding="UTF-8"%> |
<%@attribute name="staticTag" type="java.lang.Boolean" required="false" %> |
<%@attribute name="transactional" type="java.lang.Boolean" required="true" %> |
/branches/v3/impl/conf/app.properties |
---|
352,6 → 352,9 |
url.stat.ignore.extension.6=.tif |
url.stat.ignore.extension.7=.bmp |
url.stat.ignore.extension.8=.swf |
url.stat.ignore.extension.9=.otf |
url.stat.ignore.extension.10=.woff2 |
url.stat.ignore.extension.11=.ttf |
url.stat.ignore.prefix.1=/urlstat |
url.stat.ignore.prefix.2=/public/ |
/branches/v3/impl/src/java/jomm/utils/test/TestDesUtils.java |
---|
New file |
0,0 → 1,31 |
package jomm.utils.test; |
import jomm.utils.DesUtils; |
import junit.framework.TestCase; |
import java.io.FileNotFoundException; |
import java.io.UnsupportedEncodingException; |
/** |
* Created by jorgemachado on 18/10/17. |
*/ |
public class TestDesUtils extends TestCase |
{ |
public void testEncrypts() throws FileNotFoundException, UnsupportedEncodingException { |
String testEncrtytStr = "12 _abc#$%*()<>"; |
String encrypted = DesUtils.getInstance().encrypt(testEncrtytStr); |
String decripted = DesUtils.getInstance().decrypt(encrypted); |
assertEquals( |
decripted, |
testEncrtytStr); |
//System.out.println(encrypted); |
//String encrypted2 = DesUtils.getInstance().encryptJava8(testEncrtytStr); |
//System.out.println(encrypted2); |
//assertEquals(encrypted,encrypted2); |
//String decripted2 = DesUtils.getInstance().decryptJava8(encrypted2); |
//assertEquals(testEncrtytStr, decripted2); |
} |
} |
/branches/v3/impl/src/java/jomm/utils/DesUtils.java |
---|
1,12 → 1,10 |
package jomm.utils; |
import javax.crypto.Cipher; |
import javax.crypto.IllegalBlockSizeException; |
import javax.crypto.SecretKey; |
import javax.crypto.IllegalBlockSizeException; |
import javax.crypto.KeyGenerator; |
import javax.crypto.spec.SecretKeySpec; |
import java.io.UnsupportedEncodingException; |
import java.security.NoSuchAlgorithmException; |
/** |
* @author Jorge Machado |
87,7 → 85,8 |
return desUtils; |
} |
public String encrypt(String str) { |
/*public String encrypt(String str) { |
try { |
// Encode the string into bytes using utf-8 |
byte[] utf8 = str.getBytes("UTF8"); |
103,9 → 102,32 |
} catch (java.io.IOException e) { |
} |
return null; |
}*/ |
/** |
* only for JAVA8 |
* @param str |
* @return |
*/ |
public String encrypt(String str) { |
try { |
// Encode the string into bytes using utf-8 |
byte[] utf8 = str.getBytes("UTF8"); |
// Encrypt |
byte[] enc = ecipher.doFinal(utf8); |
// Encode bytes to base64 to get a string |
return java.util.Base64.getEncoder().encodeToString(enc); |
} catch (javax.crypto.BadPaddingException e) { |
} catch (IllegalBlockSizeException e) { |
} catch (UnsupportedEncodingException e) { |
} catch (java.io.IOException e) { |
} |
return null; |
} |
public String decrypt(String str) { |
/* public String decrypt(String str) { |
try { |
// Decode base64 to get bytes |
byte[] dec = new sun.misc.BASE64Decoder().decodeBuffer(str); |
121,6 → 143,29 |
} catch (java.io.IOException e) { |
} |
return null; |
}*/ |
/** |
* only JAVA 8 |
* @param str |
* @return |
*/ |
public String decrypt(String str) { |
try { |
// Decode base64 to get bytes |
byte[] dec = java.util.Base64.getDecoder().decode(str); |
// Decrypt |
byte[] utf8 = dcipher.doFinal(dec); |
// Decode using utf-8 |
return new String(utf8, "UTF8"); |
} catch (javax.crypto.BadPaddingException e) { |
} catch (IllegalBlockSizeException e) { |
} catch (UnsupportedEncodingException e) { |
} catch (java.io.IOException e) { |
} |
return null; |
} |
public static void main(String[] args) |
/branches/v3/impl/src/java/jomm/web/utils/TestHttpServletRequest.java |
---|
File deleted |
/branches/v3/impl/src/java/pt/estgp/estgweb/utils/DatesUtils.java |
---|
4,13 → 4,10 |
import org.json.JSONException; |
import org.json.JSONObject; |
import org.json.XML; |
import pt.estgp.estgweb.utils.Globals; |
import java.text.MessageFormat; |
import java.text.SimpleDateFormat; |
import java.util.ArrayList; |
import java.util.Date; |
import java.util.List; |
import java.util.*; |
/** |
* @author Jorge Machado |
104,6 → 101,8 |
return Integer.parseInt(year1) + 1; |
} |
public static enum SemestreModerate |
{ |
S1, |
275,4 → 274,37 |
System.out.println(y); |
*/ |
} |
public static int getHours(Date d) |
{ |
Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance |
calendar.setTime(d); // assigns calendar to given date |
return calendar.get(Calendar.HOUR_OF_DAY); // gets hour in 24h format |
} |
public static int getMinutes(Date d) |
{ |
Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance |
calendar.setTime(d); // assigns calendar to given date |
return calendar.get(Calendar.MINUTE); |
} |
public static int getYear(Date d) { |
Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance |
calendar.setTime(d); // assigns calendar to given date |
return calendar.get(Calendar.YEAR); |
} |
public static int getMonth(Date d) { |
Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance |
calendar.setTime(d); // assigns calendar to given date |
return calendar.get(Calendar.MONTH) + 1; |
} |
public static int getDay(Date d) { |
Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance |
calendar.setTime(d); // assigns calendar to given date |
return calendar.get(Calendar.DAY_OF_MONTH); |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/test/TestPdfSumaries.java |
---|
New file |
0,0 → 1,97 |
package pt.estgp.estgweb.services.sigesimports.test; |
import junit.framework.TestCase; |
import org.json.JSONArray; |
import org.json.JSONObject; |
import pt.estgp.estgweb.domain.*; |
import pt.estgp.estgweb.services.sigesimports.ImportSumariesJson; |
import pt.estgp.estgweb.utils.DatesWebUtils; |
import java.util.ArrayList; |
import java.util.List; |
/** |
* Created by jorgemachado on 18/10/17. |
*/ |
public class TestPdfSumaries extends TestCase |
{ |
public void testGeneratePdf() throws Exception { |
TeacherImpl responsavel = new TeacherImpl(); |
responsavel.setName("Jorge Machado"); |
responsavel.setSigesCode(20128); |
CourseUnit c = new CourseUnitImpl(); |
c.setUpdateDate(DatesWebUtils.getDateFromString("2017/02/02")); |
c.setResponsableTeacher(responsavel); |
c.setCode("209534"); |
c.setCourseCode("9119"); |
c.setName("Engenharia do Software"); |
c.setSemestre("S1"); |
c.setCourseName("Engenharia Informatica"); |
c.setCourseYear("201718"); |
c.setImportYear("201718"); |
Course course = new CourseImpl(); |
c.setCourse(course); |
course.setName("Engenharia Informatica"); |
course.setCode("9119"); |
CourseDepartment department = new CourseDepartmentImpl(); |
department.setName("Tecnologia"); |
CourseSchoolImpl courseSchool = new CourseSchoolImpl(); |
courseSchool.setName("ESTG"); |
courseSchool.setInstitutionalCode("2222"); |
department.setCourseSchool(courseSchool); |
course.setDepartment(department); |
List<CourseUnitSummary> courseUnitSummaries = new ArrayList<CourseUnitSummary>(); |
JSONObject summariesJson = new JSONObject(); |
JSONArray summaries = new JSONArray(); |
summariesJson.put("summary",summaries); |
CourseUnitSummaryImpl s = DomainObjectFactory.createCourseUnitSummaryImpl(); |
s.setCourseUnit(c); |
s.setCdTipoOcupacao(1); |
s.setNrAula(21569); |
s.setCodigoSumario("-1"); |
s.setCodigoAula("" + 1); |
s.setNumeroAula(1); |
s.setDataAula(DatesWebUtils.getDateFromString("2017/01/28")); |
s.setTipoAula("Teorica"); |
s.setCodigoSalaAula("1127"); |
s.setAlunosPresentes(15); |
s.setTitulo("Apresentacao da Unidade"); |
s.setCodigoDocente("20128"); |
s.setCdResponsavel("-1"); |
s.setDescricao("Regras de Avaliação"); |
s.setcEstado("1"); |
s.setNumeroHoras("2"); |
s.setCdTurma("TEINF"); |
summaries.put(s.toJsonObject()); |
courseUnitSummaries.add(s); |
c.setSummariesJson(summariesJson.toString()); |
c.setNormalizedName("Engenharia.Do.Software.209534"); |
String path = ImportSumariesJson.generatePdf(c); |
System.out.println(new java.io.File(path).length()); |
//System.out.println(md5); |
assertTrue( |
"Testando o tamanho do ficheiro de sumarios, caso o template seja alterado altere este valor", |
new java.io.File(path).length() > 6000 ); |
new java.io.File(path).delete(); |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java |
---|
11,6 → 11,7 |
import org.json.JSONArray; |
import org.json.JSONException; |
import org.json.JSONObject; |
import pt.estgp.estgweb.services.sigesimports.oracle.domain.Aula; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.domain.*; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
144,7 → 145,7 |
int tries = 3; |
//ArrayOfAula arrayOfAulas = null; |
ArrayList<pt.estgp.estgweb.services.sigesimports.oracle.domain.Aula> arrayOfAulas = null; |
ArrayList<pt.estgp.estgweb.services.sigesimports.oracle.domain.Aula> arrayOfAulas = new ArrayList<Aula>(); |
while(tries > 0) |
{ |
//comentario de teste |
160,8 → 161,16 |
String msg = "courseUnit:" + cId + " ( " + c.getName() + " ) com sumarios num semestre diferente, atribuido pela administracao do baco: " + semestreEmQueForamCriadosOsSumarios; |
logger.info(msg); |
serviceLogInfo(msg); |
arrayOfAulas = AulaDao.getInstance().loadAulas(institutionCode,year,c.getCode(),semestreEmQueForamCriadosOsSumarios,c.getCourse().getCode(),conn); |
} |
arrayOfAulas = AulaDao.getInstance().loadAulas(institutionCode,year,c.getCode(),semestreEmQueForamCriadosOsSumarios,c.getCourse().getCode(),conn); |
ArrayList<pt.estgp.estgweb.services.sigesimports.oracle.domain.Aula> aulasSemestreUnidade = AulaDao.getInstance().loadAulas(institutionCode,year,c.getCode(),semestre,c.getCourse().getCode(),conn); |
if(aulasSemestreUnidade!=null && aulasSemestreUnidade.size() > 0) |
{ |
String msg = "courseUnit:" + cId + " ( " + c.getName() + " ) tem sumarios no semestre da unidade " + semestre; |
logger.info(msg); |
serviceLogInfo(msg); |
arrayOfAulas.addAll(aulasSemestreUnidade); |
} |
break; |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/urlstat/ChartBuilderService.java |
---|
1,39 → 1,36 |
package pt.estgp.estgweb.services.urlstat; |
import jomm.utils.BytesUtils; |
import jomm.utils.DatesUtils; |
import jomm.utils.MessageResources; |
import jomm.utils.MyCalendar; |
import org.apache.log4j.Logger; |
import org.apache.commons.httpclient.util.URIUtil; |
import org.apache.commons.httpclient.URIException; |
import org.apache.commons.httpclient.util.URIUtil; |
import org.apache.log4j.Logger; |
import org.jfree.chart.ChartFactory; |
import org.jfree.chart.ChartUtilities; |
import org.jfree.chart.JFreeChart; |
import org.jfree.chart.axis.DateAxis; |
import org.jfree.chart.plot.XYPlot; |
import org.jfree.data.time.Day; |
import org.jfree.data.time.Month; |
import org.jfree.data.time.TimeSeries; |
import org.jfree.data.time.TimeSeriesCollection; |
import org.jfree.data.time.Month; |
import pt.estgp.estgweb.domain.UrlStat; |
import pt.estgp.estgweb.domain.UrlStatDay; |
import pt.estgp.estgweb.domain.UrlStatMonth; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
import pt.estgp.estgweb.services.expceptions.ServiceException; |
import pt.estgp.estgweb.utils.Globals; |
import jomm.utils.DatesUtils; |
import jomm.utils.BytesUtils; |
import jomm.dao.impl.AbstractDao; |
import jomm.web.utils.TestHttpServletRequest; |
import pt.utl.ist.berserk.logic.serviceManager.IService; |
import javax.servlet.http.HttpServletRequest; |
import java.awt.*; |
import java.io.File; |
import java.io.IOException; |
import java.text.SimpleDateFormat; |
import java.util.Date; |
import java.util.List; |
import java.util.ArrayList; |
import java.text.SimpleDateFormat; |
/** |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/common/CommonServicesManager.java |
---|
2,21 → 2,21 |
import jomm.ir.lucene.LuceneUtils; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.domain.DomainObject; |
import pt.estgp.estgweb.domain.UserSession; |
import pt.estgp.estgweb.services.common.impl.CommonSearchResults; |
import pt.estgp.estgweb.services.common.impl.DefaultResult; |
import pt.estgp.estgweb.services.common.impl.DefaultSearchResults; |
import pt.estgp.estgweb.services.common.impl.DefaultToDoCat; |
import pt.estgp.estgweb.web.UserSessionProxy; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.web.exceptions.NotAuthorizedException; |
import pt.estgp.estgweb.web.utils.TestHttpServletRequest; |
import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterRetrieveException; |
import java.util.ArrayList; |
import java.util.List; |
//import pt.estgp.estgweb.web.utils.TestHttpServletRequest; |
/** |
* @author Jorge Machado |
* @date 24/Abr/2008 |
319,7 → 319,7 |
public static void main(String[] args) throws Throwable |
{ |
ICommonSearchResults commonSearchResults = new CommonServicesManager().search(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null), "teste", SearchTypeEnum.AllWords); |
/*ICommonSearchResults commonSearchResults = new CommonServicesManager().search(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null), "teste", SearchTypeEnum.AllWords); |
for (ISearchResults searchResults : commonSearchResults.getSearchResults()) |
{ |
System.out.println("-----------------------------------------------------"); |
347,8 → 347,9 |
// } |
} |
CommonServicesManager.getInstance().getAllToDosCats(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null)); |
System.out.println(CommonServicesManager.getInstance().getAllToDosCats(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null))); |
//CommonServicesManager.getInstance().getAllToDosCats(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null)); |
//System.out.println(CommonServicesManager.getInstance().getAllToDosCats(UserSessionProxy.loadUserSession(new TestHttpServletRequest("2093FFF41F61E375D2CB4CBEDE4400E9"),null))); |
*/ |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/assessments/GeneratePdfService.java |
---|
8,6 → 8,7 |
import com.itextpdf.text.pdf.draw.LineSeparator; |
import jomm.utils.FilesUtils; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.utils.DatesUtils; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.domain.*; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
98,7 → 99,7 |
String dateText = "Data:"; |
String date = " "+ DatesWebUtils.getStringFromDate(assessment.getStartDate()); |
String timeText = " - Dura��o:"; |
String time = " "+String.valueOf(assessment.getTime().getHours())+":"+String.valueOf(assessment.getTime().getMinutes()); |
String time = " "+String.valueOf(DatesUtils.getHours(assessment.getTime()))+":"+String.valueOf(DatesUtils.getMinutes(assessment.getTime())); |
String ownerText = " - Docente:"; |
String owner = " "+assessment.getOwner().getName(); |
Paragraph secondLine = new Paragraph(); |
302,7 → 303,7 |
String dateText = "Data:"; |
String date = " "+ DatesWebUtils.getStringFromDate(assessment.getStartDate()); |
String timeText = " - Dura��o:"; |
String time = " "+String.valueOf(assessment.getTime().getHours())+":"+String.valueOf(assessment.getTime().getMinutes()); |
String time = " "+String.valueOf(DatesUtils.getHours(assessment.getTime()))+":"+String.valueOf(DatesUtils.getMinutes(assessment.getTime())); |
String ownerText = " - Docente:"; |
String owner = " "+assessment.getOwner().getName(); |
String quotationText = " - Nota:"; |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/BpmnActorPoolInstanceImpl.java |
---|
1,7 → 1,7 |
package pt.estgp.estgweb.domain; |
import sun.reflect.generics.reflectiveObjects.NotImplementedException; |
/** |
* Created by jorgemachado on 09/02/17. |
*/ |
17,7 → 17,7 |
return true; |
} |
return false;*/ |
throw new NotImplementedException(); |
throw new RuntimeException("Not Implemented"); |
} |
public void replaceRole(String oldRole,String newRole) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java |
---|
1010,7 → 1010,7 |
/* |
private static Genson getGensonMergedTipologiasComplete(){ |
Genson genson = new Genson.Builder() |
Genson genson = new GensonBuilder() |
.exclude(Object.class) |
.include(Boolean.class) |
.include(Integer.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentInterfaceImpl.java |
---|
24,7 → 24,7 |
static Genson genson; |
static { |
GensonBuilder gensonBuilder = new Genson.Builder() |
GensonBuilder gensonBuilder = new GensonBuilder() |
.exclude(Object.class) |
.include(Boolean.class) |
.include(Integer.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/PageSectionImpl.java |
---|
2,14 → 2,11 |
import com.owlike.genson.Genson; |
import com.owlike.genson.GensonBuilder; |
import org.json.JSONArray; |
import org.json.JSONException; |
import org.json.JSONObject; |
import pt.estgp.estgweb.services.virtualfilesystem.dto.VfsAbstractPageContentDto; |
import java.io.IOException; |
import java.io.Serializable; |
import java.util.ArrayList; |
import java.util.List; |
import java.util.Set; |
114,9 → 111,10 |
return new JSONObject(toJson()); |
} |
/* |
public static JSONArray toJsonArray(List<PageSectionImpl> itemGroup) throws IOException, JSONException { |
return new JSONArray(genson.serialize(itemGroup)); |
} |
}*/ |
/*public String getPath(){ |
if(getParent()==null) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/typesgen/controloatividadedocente/EsquemaPontos.java |
---|
1,6 → 1,7 |
package pt.estgp.estgweb.domain.typesgen.controloatividadedocente; |
import com.owlike.genson.Genson; |
import com.owlike.genson.GensonBuilder; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.domain.typesgen.BacoDataAbstractType; |
22,7 → 23,7 |
this.atividades = atividades; |
} |
static Genson genson = new Genson.Builder() |
static Genson genson = new GensonBuilder() |
.include(Boolean.class) |
.include(Integer.class) |
.include(Long.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/typesgen/controloatividadedocente/PontosAtribuidos.java |
---|
1,6 → 1,7 |
package pt.estgp.estgweb.domain.typesgen.controloatividadedocente; |
import com.owlike.genson.Genson; |
import com.owlike.genson.GensonBuilder; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.domain.typesgen.BacoDataAbstractType; |
25,7 → 26,7 |
static Genson genson = new Genson.Builder() |
static Genson genson = new GensonBuilder() |
.include(Boolean.class) |
.include(Integer.class) |
.include(Long.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentImpl.java |
---|
1,6 → 1,7 |
package pt.estgp.estgweb.domain; |
import com.owlike.genson.Genson; |
import com.owlike.genson.GensonBuilder; |
import jomm.dao.impl.AbstractDao; |
import org.json.JSONArray; |
import org.json.JSONException; |
49,7 → 50,7 |
return ""; |
} |
static Genson gensonSerialize = new Genson.Builder() |
static Genson gensonSerialize = new GensonBuilder() |
.exclude(Object.class) |
.include(Boolean.class) |
.include(Integer.class) |
85,7 → 86,7 |
.create(); |
static Genson gensonDeserialize = new Genson.Builder() |
static Genson gensonDeserialize = new GensonBuilder() |
.exclude(Object.class) |
//.include(ArrayList.class) |
//.include(Set.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/BpmnActorPoolImpl.java |
---|
1,6 → 1,5 |
package pt.estgp.estgweb.domain; |
import sun.reflect.generics.reflectiveObjects.NotImplementedException; |
/** |
* Created by jorgemachado on 03/02/17. |
19,7 → 18,7 |
} |
return false; |
*/ |
throw new NotImplementedException(); |
throw new RuntimeException("Not Implemented"); |
} |
public void replaceRole(String oldRole,String newRole) |
36,7 → 35,7 |
} |
} |
*/ |
throw new NotImplementedException(); |
throw new RuntimeException("Not Implemented"); |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/genson/TestFieldsAndMethodsTogether.java |
---|
5,6 → 5,7 |
import junit.framework.TestCase; |
import org.json.JSONException; |
import org.json.JSONObject; |
import pt.estgp.estgweb.utils.DatesUtils; |
import java.util.Date; |
294,9 → 295,9 |
//Tem um metodo que usa o valor e o acerta |
assertEquals(t2.getDateStr2(),t.getDateStr2()); |
assertEquals(t2.getSaveDate().getYear(),t.getSaveDate().getYear()); |
assertEquals(t2.getSaveDate().getMonth(),t.getSaveDate().getMonth()); |
assertEquals(t2.getSaveDate().getDay(),t.getSaveDate().getDay()); |
assertEquals(DatesUtils.getYear(t2.getSaveDate()),DatesUtils.getYear(t.getSaveDate())); |
assertEquals(DatesUtils.getMonth(t2.getSaveDate()),DatesUtils.getMonth(t.getSaveDate())); |
assertEquals(DatesUtils.getDay(t2.getSaveDate()),DatesUtils.getDay(t.getSaveDate())); |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/PageContentImpl.java |
---|
467,7 → 467,7 |
} |
private static Genson getGenson(){ |
Genson genson = new Genson.Builder() |
Genson genson = new GensonBuilder() |
.exclude(Object.class) |
.include("access", Acl.class) |
.include("type", Acl.class) |
/branches/v3/impl/src/java/pt/estgp/estgweb/filters/filters/AccessLogger.java |
---|
1,12 → 1,13 |
package pt.estgp.estgweb.filters.filters; |
import java.util.Date; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.filters.chains.LoggingFilter; |
import pt.utl.ist.berserk.ServiceRequest; |
import pt.utl.ist.berserk.ServiceResponse; |
import pt.utl.ist.berserk.logic.filterManager.FilterParameters; |
import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterException; |
import pt.utl.ist.berserk.logic.filterManager.FilterParameters; |
import pt.estgp.estgweb.filters.chains.LoggingFilter; |
import org.apache.log4j.Logger; |
import java.util.Date; |
public class AccessLogger extends LoggingFilter |
{ |
private static final Logger logger = Logger.getLogger(AccessLogger.class); |
15,6 → 16,6 |
public void execute(ServiceRequest request, ServiceResponse response, FilterParameters filterParameters) throws FilterException, Exception |
{ |
logger.info("Mr." + request.getRequester() + " accessed "+ request.getService()+ " at " + new Date(System.currentTimeMillis())); |
logger.info("Mr." + request.getRequester() + " accessed "+ request.getService()+ " at " + new Date(System.currentTimeMillis()) + " - " + request.getMethodName()); |
} |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/utils/TestHttpServletRequest.java |
---|
File deleted |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/ajaxapis/ServicosImpressao.java |
---|
1,9 → 1,10 |
package pt.estgp.estgweb.web.ajaxapis; |
import jomm.utils.StreamsUtils; |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.web.UserSessionProxy; |
//import java.util.Base64; |
import javax.servlet.ServletException; |
import javax.servlet.http.HttpServlet; |
12,8 → 13,6 |
import java.io.*; |
import java.net.MalformedURLException; |
import org.apache.log4j.Logger; |
/** |
* @author Jorge |
* @date 24/Mar/2009 |
47,7 → 46,9 |
{ |
String user = Globals.INTRANET_IMPRESSAO_SERVICO_AUTH_USER; |
String pass = Globals.INTRANET_IMPRESSAO_SERVICO_AUTH_PASS; |
String encoding = new sun.misc.BASE64Encoder().encode((user + ":" + pass).getBytes()); |
//String encoding = new BASE64Encoder().encode((user + ":" + pass).getBytes()); |
//todo rever no futuro |
String encoding = ""; |
connection.setRequestProperty ("Authorization", "Basic " + encoding); |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/assessments/AssessmentController.java |
---|
4,13 → 4,13 |
import org.apache.struts.action.ActionForm; |
import org.apache.struts.action.ActionForward; |
import org.apache.struts.action.ActionMapping; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.domain.UserSessionImpl; |
import pt.estgp.estgweb.domain.views.*; |
import pt.estgp.estgweb.utils.DatesWebUtils; |
import pt.estgp.estgweb.utils.Globals; |
import pt.estgp.estgweb.web.UserSessionProxy; |
import pt.estgp.estgweb.web.controllers.AddRolesController; |
import pt.estgp.estgweb.web.form.assessments.AssessmentsForm; |
import pt.estgp.estgweb.utils.DatesWebUtils; |
import pt.estgp.estgweb.web.utils.DomainUtils; |
import pt.estgp.estgweb.web.utils.RequestUtils; |
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager; |
21,8 → 21,9 |
import javax.servlet.http.HttpServletRequest; |
import javax.servlet.http.HttpServletResponse; |
import java.io.Serializable; |
import java.sql.Time; |
import java.util.ArrayList; |
import java.util.Calendar; |
import java.util.GregorianCalendar; |
import java.util.List; |
/** |
668,23 → 669,38 |
{ |
view.setStartDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); |
view.setEndDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); //a data de fim fica a mesma que a data de inicio |
view.getEndDate().setHours(23); |
view.getEndDate().setMinutes(59); |
view.getEndDate().setSeconds(59); |
GregorianCalendar c = new GregorianCalendar(); |
c.setTime(view.getEndDate()); |
c.set(Calendar.HOUR_OF_DAY,23); |
c.set(Calendar.MINUTE,59); |
c.set(Calendar.SECOND,59); |
view.setEndDate(c.getTime()); |
} |
if(view.getType().equals(Globals.ASSESSMENT_TYPE_SELFEVALUATION)) |
{ |
view.setStartDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); |
view.setEndDate(DatesWebUtils.getDateFromString(assessmentsForm.getEndDate())); |
view.getEndDate().setHours(23); |
view.getEndDate().setMinutes(59); |
view.getEndDate().setSeconds(59); |
GregorianCalendar c = new GregorianCalendar(); |
c.setTime(view.getEndDate()); |
c.set(Calendar.HOUR_OF_DAY,23); |
c.set(Calendar.MINUTE,59); |
c.set(Calendar.SECOND,59); |
view.setEndDate(c.getTime()); |
} |
//tratar dos tempos |
String[] times = assessmentsForm.getTime().split("\\:"); |
int hours = Integer.parseInt(times[0]); |
int minutes = Integer.parseInt(times[1]); |
view.setTime(new Time(hours,minutes,0)); |
GregorianCalendar c = new GregorianCalendar(); |
c.setTime(view.getEndDate()); |
c.set(Calendar.YEAR,1970); |
c.set(Calendar.MONTH,0); |
c.set(Calendar.DAY_OF_MONTH,1); |
c.set(Calendar.HOUR_OF_DAY,hours); |
c.set(Calendar.MINUTE,minutes); |
c.set(Calendar.SECOND,0); |
view.setEndDate(c.getTime()); |
view.setTime(c.getTime()); |
//tratar os alunos selecionados |
List<Long> selectedUsersId = new ArrayList<Long>(); |
for(int i=0;i<assessmentsForm.getSelectedUsers().length;i++) |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/filters/UserRoleProxy.java |
---|
133,7 → 133,7 |
} |
catch (Throwable e) |
{ |
logger.fatal("INIT FILTER SESSION FILTER CALLING FIRST SERVICE TO OPEN CONNECTIONS IN HIBERNATE" + e,e); |
logger.fatal("INIT FILTER SESSION FILTER CALLING FIRST SERVICE TO OPEN CONNECTIONS IN HIBERNATE " + e,e); |
} |
} |
171,9 → 171,11 |
} |
} |
} |
catch (Throwable e) |
//Abre |
//Abre outra vez Quando chama o Load |
catch (Throwable e) // aqui falha porque já fechou a transacao concerteza a tentar load configuration no filtro session |
{ |
logger.fatal("INIT FILTER USER ROLE FILTER CALLING FIRST SERVICE TO OPEN CONNECTIONS IN HIBERNATE" + e,e); |
logger.fatal("INIT FILTER USER ROLE FILTER CALLING FIRST SERVICE TO OPEN CONNECTIONS IN HIBERNATE " + e,e); |
} |
chain.doFilter(request,response); |
} |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/filters/UserSessionFilter.java |
---|
92,7 → 92,7 |
if(((HttpServletRequest)request).getServletPath().indexOf("errorNoCookies.do")>=0 || !hrequest.isRequestedSessionIdFromCookie()) |
{ |
//chain.doFilter(request,response); |
logger.info("COOKIE lost"); |
logger.info("COOKIE lost: " + hrequest.getRequestedSessionId()); |
} |
try |
102,7 → 102,7 |
if(userSession == null) |
{ |
dummy = true; |
System.out.println("Creating dummy UserSession"); |
logger.warn("Creating dummy UserSession: " + request.getRemoteAddr() + " : " + request.getRemoteHost() + " : " + request.getRemotePort()); |
userSession = new UserSessionImpl();//creating a dummy there is no cookie |
request.setAttribute(Globals.USER_SESSION_KEY,userSession); |
userSession.setIpAddress(request.getRemoteAddr() + " : " + request.getRemoteHost() + " : " + request.getRemotePort()); |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/filters/UrlDisplayFilter.java |
---|
New file |
0,0 → 1,63 |
package pt.estgp.estgweb.web.filters; |
/** |
* Created by jorgemachado on 24/05/16. |
*/ |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.utils.Globals; |
import javax.servlet.*; |
import javax.servlet.http.HttpServletRequest; |
import java.io.IOException; |
import java.util.List; |
public class UrlDisplayFilter implements Filter { |
private static Logger logger = Logger.getLogger(UrlDisplayFilter.class); |
public static final List<String> URL_STAT_IGNORE_EXTENSIONS = Globals.URL_STAT_IGNORE_EXTENSIONS; |
@Override |
public void init(FilterConfig filterConfig) throws ServletException { |
} |
public void doFilter(ServletRequest request, ServletResponse response, |
FilterChain chain) throws IOException, ServletException { |
HttpServletRequest req = (HttpServletRequest) request; |
String relativePath = req.getServletPath(); |
if (relativePath == null) |
relativePath = ""; |
if (req.getPathInfo() != null && req.getPathInfo().length() > 0) |
{ |
relativePath += req.getPathInfo(); |
} |
for (String ignore : URL_STAT_IGNORE_EXTENSIONS) |
{ |
if (relativePath.endsWith(ignore)) |
{ |
chain.doFilter(request, response); |
return; |
} |
} |
//String sessId = req.getSession() != null ? req.getSession().getId() : " no session "; |
String ipAddress = req.getHeader("X-FORWARDED-FOR"); |
if (ipAddress == null) { |
ipAddress = request.getRemoteAddr(); |
} |
logger.info("url[" + req.getRequestURL().toString() + "] reqSessionId[" + req.getRequestedSessionId() + "] servletPath[" + req.getServletPath() + "] ip[" + ipAddress + "]"); |
chain.doFilter(request, response); |
} |
@Override |
public void destroy() { |
} |
} |
/branches/v3/impl/src/java/pt/utl/ist/berserk/storage/hibernate/HibernateTransactionBroker.java |
---|
4,7 → 4,6 |
import org.hibernate.LockMode; |
import org.hibernate.Session; |
import org.hibernate.Transaction; |
import pt.utl.ist.berserk.logic.serviceManager.TransactionalServiceInvoker; |
import pt.utl.ist.berserk.storage.ITransactionBroker; |
import pt.utl.ist.berserk.storage.exceptions.StorageException; |
43,9 → 42,9 |
@Override |
public boolean isTransactionActive() throws StorageException |
{ |
return false; |
/*boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
if(TransactionalServiceInvoker.debug) |
{ |
boolean wasCommited = HibernateUtils.getCurrentSession().getTransaction().wasCommitted(); |
55,18 → 54,17 |
System.out.println("THREAD:" + Thread.currentThread().getId() + ": Was RolledBack: " + wasRoledBack); |
System.out.println("THREAD:" + Thread.currentThread().getId() + ": Is Active: " + isActive); |
} |
//if(!isActive) |
// return false; |
*/ |
//return !wasCommited && !wasRoledBack; |
return opened; |
//return opened; |
} |
public void beginTransaction() throws StorageException |
{ |
boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
if(!opened) |
openedTransactions.put(Thread.currentThread().getId(),"beginTransaction"); |
//boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
//if(!opened) |
// openedTransactions.put(Thread.currentThread().getId(),"beginTransaction"); |
HibernateUtils.getCurrentSession().beginTransaction(); |
} |
78,9 → 76,9 |
HibernateUtils.getCurrentSession().getTransaction().commit(); |
// HibernateUtils.getCurrentSession().close(); |
boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
if(opened) |
openedTransactions.remove(Thread.currentThread().getId()); |
//boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
//if(opened) |
// openedTransactions.remove(Thread.currentThread().getId()); |
} |
90,9 → 88,9 |
Transaction t = sess.getTransaction(); |
t.rollback(); |
boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
if(opened) |
openedTransactions.remove(Thread.currentThread().getId()); |
//boolean opened = openedTransactions.containsKey(Thread.currentThread().getId()); |
//if(opened) |
// openedTransactions.remove(Thread.currentThread().getId()); |
// sess.close(); |
} |
/branches/v3/impl/src/java/pt/utl/ist/berserk/storage/empty/TransactionBrokerEmpty.java |
---|
29,7 → 29,6 |
package pt.utl.ist.berserk.storage.empty; |
import pt.utl.ist.berserk.storage.ITransactionBroker; |
import pt.utl.ist.berserk.storage.exceptions.StorageException; |
import sun.reflect.generics.reflectiveObjects.NotImplementedException; |
import java.util.List; |
/** |
56,7 → 55,7 |
} |
public boolean isTransactionActive() throws StorageException |
{ |
throw new NotImplementedException(); |
throw new RuntimeException("Not Implemented"); |
} |
public void beginTransaction() throws StorageException |
{ |
/branches/v3/impl/src/java/pt/utl/ist/berserk/logic/serviceManager/TransactionalServiceInvoker.java |
---|
68,11 → 68,12 |
ServiceResponse response = new ServiceResponse(); |
FilteringResult filteringResult = null; |
ITransactionBroker tb = BerserkConfiguration.getApplicationTransactionBroker(); |
//ESTE MECANISMO ESTA AQUI MAS ESTA COMO SE NAO ESTIVESSE |
//ESTAMOS SEMPRE A DIZER QUE A TRANSACAO NAO EXISTE |
//DESTA FORMA NAO CONVEM CHAMAR TRANSACOES DENTRO DE OUTRAS |
boolean alreadyActive = tb.isTransactionActive(); |
try |
{ |
if(debug) |
System.out.println("THREAD:" + Thread.currentThread().getId() + "Starting transaction for service: " + service.getClass().getName() + " method:" + methodName); |
if(!alreadyActive) |
83,10 → 84,17 |
{ |
System.out.println("THREAD:" + Thread.currentThread().getId() + "AVISO : ESTA A CHAMAR UM SERVICO TRANSACIONAL DENTRO DE UMA TRANSACAO, VAMOS MANTER A MESMA TRASACAO"); |
System.out.println(">>>>>>TRANSACTION WARNING BUT NO PROBLEM: AVISO: Já existia uma transação activa e foi iniciada outra neste momento sem fechar a anterior "); |
System.out.println("Servico chamado: " + service.getClass().getName()); |
System.out.println("Metodo chamado: " + methodName); |
System.out.println("Requester: " + requester); |
System.out.println("Arguments: " + arguments); |
System.out.println("ArgNames: " + names); |
for (StackTraceElement ste : Thread.currentThread().getStackTrace()) { |
System.out.println("\t" + ste); |
} |
} |
try |
{ |
/branches/v3/impl/src/doc/BacoV32016/linuxInstall/firewallIps |
---|
New file |
0,0 → 1,26 |
No linux para bloquear um ip |
que aparece como bot |
no log |
tail -f /var/log/apache2/other_vhosts_access.log |
iptables -I INPUT -s 51.255.71.0/255.255.255.0 -j DROP |
semrush |
iptables -I INPUT -s 46.229.168.0/255.255.255.0 -j DROP |
ahrefs.com |
iptables -I INPUT -s 51.255.65.0/255.255.255.0 -j DROP |
iptables -I INPUT -s 217.182.132.0/255.255.255.0 -j DROP |
para listar |
iptables -L |
Chain INPUT (policy ACCEPT) |
target prot opt source destination |
DROP all -- 164.132.162.0/24 anywhere |
DROP all -- 217.182.132.0/24 anywhere |
DROP all -- 51.255.65.0/24 anywhere |
DROP all -- 164.132.161.0/24 anywhere |
DROP all -- 51.255.71.0/24 anywhere |
ver o ficheiro robots.txt em /src/web |
/branches/v3/impl/src/web/robots.txt |
---|
New file |
0,0 → 1,15 |
User-Agent: * |
Disallow: |
Disallow: / |
User-Agent: Googlebot |
Disallow: / |
User-agent: SemrushBot-SA |
Disallow: / |
User-agent: SemrushBot |
Disallow: / |
User-agent: AhrefsBot |
Disallow: / |
/branches/v3/impl/src/web/admin/tools/glyphicons.jsp |
---|
13,7 → 13,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<html:html locale="true"> |
<html:html> |
<head> |
<title><bean:message key="site.title"/> </title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/statUnits.jsp |
---|
5,7 → 5,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<html:html locale="true"> |
<html:html> |
<head> |
<title>Consulta de Unidades Curriculares</title> |
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/style.css"/> |
/branches/v3/impl/src/web/units.jsp |
---|
9,7 → 9,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<html:html locale="true"> |
<html:html> |
<head> |
<title>Consulta de Unidades Curriculares</title> |
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/style.css"/> |
/branches/v3/impl/src/web/layout/siteSimpleLayoutRefreshTimeout.jsp |
---|
7,7 → 7,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" |
"http://www.w3.org/TR/html4/loose.dtd"> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/siteSimpleLayoutRedirectTimeout.jsp |
---|
7,7 → 7,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" |
"http://www.w3.org/TR/html4/loose.dtd"> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/siteSimpleLayout.jsp |
---|
6,7 → 6,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> |
<html:html locale="true"> |
<html:html > |
<head> |
<html:base /> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
/branches/v3/impl/src/web/layout/layoutpaeauth.jsp |
---|
6,7 → 6,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title>Sistema de Planeamento Arquitetura de informação Empresarial PAE |
<%--<bean:message key="site.title"/> - <tiles:getAsString name="title"/>--%></title> |
/branches/v3/impl/src/web/layout/errorLayout.jsp |
---|
13,7 → 13,7 |
%> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> |
<html:html locale="true"> |
<html:html > |
<head> |
<html:base/> |
<title> |
/branches/v3/impl/src/web/layout/layoutWelcome.jsp |
---|
5,7 → 5,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/layout0.jsp |
---|
6,7 → 6,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/layoutpaepublic.jsp |
---|
6,7 → 6,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<html:html locale="true"> |
<html:html> |
<head> |
<title>Sistema de Planeamento Arquitetura de informação Empresarial PAE |
<%--<bean:message key="site.title"/> - <tiles:getAsString name="title"/>--%></title> |
/branches/v3/impl/src/web/layout/layoutintranetSemLeft.jsp |
---|
9,7 → 9,7 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
--%> |
<!DOCTYPE html> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/intranet.css"/> |
/branches/v3/impl/src/web/layout/siteLayout.jsp |
---|
5,7 → 5,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/layout0ComLeft.jsp |
---|
6,7 → 6,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ page import="pt.estgp.estgweb.utils.Globals" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/layout/layoutintranetpae.jsp |
---|
8,7 → 8,7 |
<%--<?xml version="1.0" encoding="utf-8"?>--%> |
<%--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">--%> |
<!DOCTYPE html> |
<html:html locale="true"> |
<html:html > |
<head> |
<title> |
Sistema de Planeamento Arquitetura de informação Empresarial PAE |
/branches/v3/impl/src/web/layout/layoutintranet.jsp |
---|
10,7 → 10,7 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
--%> |
<!DOCTYPE html> |
<html:html locale="true"> |
<html:html > |
<head> |
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title> |
/branches/v3/impl/src/web/user/data.jsp |
---|
8,7 → 8,7 |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ page import="pt.estgp.estgweb.utils.Globals" %> |
<html:html locale="true"> |
<html:html > |
<head> |
<title>Histórico de Ficheiros</title> |
<jsp:include page="/layout/scripts.jsp"/> |
/branches/v3/impl/src/web/user/assessments/submitAssessmentResponse.jsp |
---|
1,10 → 1,12 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ page import="pt.estgp.estgweb.domain.UserSessionImpl" %> |
<%@ page import="pt.estgp.estgweb.web.UserSessionProxy" %> |
<%@ page import="pt.estgp.estgweb.utils.Globals" %> |
<%@ page import="java.util.ArrayList" %> |
<%@ page import="java.util.List" %> |
<%@ page import="pt.estgp.estgweb.web.form.assessments.AssessmentsForm" %> |
<%@ page import="pt.estgp.estgweb.utils.DatesUtils" %> |
<%@ page import="java.util.GregorianCalendar" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
37,10 → 39,11 |
nomesSessao.add("questionsListSize"); |
sess.put("nomesSessao", (java.io.Serializable) nomesSessao); |
sess.serialize(request,response); |
%> |
<input type="hidden" name="horas" value="<%=AssessmentsForm.getAssessmentView().getTime().getHours()%>" id="horas"/> |
<input type="hidden" name="minutos" value="<%=AssessmentsForm.getAssessmentView().getTime().getMinutes()%>" id="minutos"/> |
<input type="hidden" name="horas" value="<%=DatesUtils.getHours(AssessmentsForm.getAssessmentView().getTime())%>" id="horas"/> |
<input type="hidden" name="minutos" value="<%=DatesUtils.getMinutes(AssessmentsForm.getAssessmentView().getTime())%>" id="minutos"/> |
<script language="Javascript"> |
var horasT = document.forms[0].horas.value; |
/branches/v3/impl/libs.xml |
---|
124,6 → 124,7 |
<include name="**/*.jar"/> |
</fileset> |
</path> |
<path id="pathToAntLibs"> |
/branches/v3/impl/build.xml |
---|
90,17 → 90,17 |
<taskdef name="tomcat.stop" classname="org.apache.catalina.ant.StopTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.undeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.deploy" classname="org.apache.catalina.ant.DeployTask" classpathref="pathToToolsLib"/> |
<taskdef name="tomcat.install" classname="org.apache.catalina.ant.InstallTask" classpathref="pathToToolsLib"/> |
<!--<taskdef name="tomcat.install" classname="org.apache.catalina.ant.InstallTask" classpathref="pathToToolsLib"/>--> |
<taskdef name="tomcat.jasper" classname="org.apache.jasper.JspC"> |
<classpath id="jspc.classpath"> |
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> |
<fileset dir="${tomcat.home}/bin"> |
<include name="*.jar"/> |
</fileset> |
<fileset dir="${tomcat.home}/server/lib"> |
<fileset dir="${tomcat.libs.common.home}"> |
<include name="*.jar"/> |
</fileset> |
<fileset dir="${tomcat.home}/common/lib"> |
<fileset dir="${tomcat.libs.ant.home}"> |
<include name="*.jar"/> |
</fileset> |
</classpath> |
110,12 → 110,12 |
<!-- |
TOMCAT Instalation Tasks |
--> |
<target name="tomcat.deployContext" depends="build.war"> |
<!--<target name="tomcat.deployContext" depends="build.war"> |
<echo message="${tomcat.manager}"/> |
<tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
config="file://${basedir}/${dist.dir}/estgweb.xml" |
username="${tomcat.username}" password="${tomcat.password}" /> |
</target> |
</target>--> |
<!-- |
<target name="tomcat.deployContextOnly" depends=""> |
<echo message="${tomcat.manager}"/> |
316,6 → 316,8 |
</fileset> |
</copy> |
<copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
<copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
/branches/v3/impl/etc/jvmconfig/JVM_MANAGE.txt |
---|
New file |
0,0 → 1,44 |
jps |
ver o processo do Bootstrap se for o 14667 por exemplo colocar |
jstat -gcutil 14677 |
-gcutil Option |
Summary of Garbage Collection Statistics |
Column Description |
S0 Survivor space 0 utilization as a percentage of the space's current capacity. |
S1 Survivor space 1 utilization as a percentage of the space's current capacity. |
E Eden space utilization as a percentage of the space's current capacity. |
O Old space utilization as a percentage of the space's current capacity. |
P Permanent space utilization as a percentage of the space's current capacity. |
YGC Number of young generation GC events. |
YGCT Young generation garbage collection time. |
FGC Number of full GC events. |
FGCT Full garbage collection time. |
GCT Total garbage collection time. |
Isto vai ler o historico das classes criadas em tempo real no sistema e a memoria ocupada |
31849 >> processo |
jmap -histo -F 31849 |
Pagina de Gestão de Memória |
https://stackoverflow.com/questions/11339679/100-full-eden-space-0-used-survivor-space-garbage-collection-not-done |
-XX:NewRatio=3 - the young generation will occupy 1/4 the overall heap |
-XX:NewSize - Calculated automatically if you specify -XX:NewRatio |
-XX:MaxNewSize - The largest size the young generation can grow to (unlimited if this value is not specified at command line) |
-XX:SurvivorRatio=6 |
no tomcat so funcionou o 1 e o 4 comando |
https://docs.oracle.com/cd/E19900-01/819-4742/abeik/index.html |
conf do tomcat do Baco |
export CATALINA_OPTS="-Dfile.encoding=UTF-8 -Xmx2048m -Xms2048m -XX:PermSize=256m -XX:MaxPermSize=256m -server -XX:NewRatio=3 -XX:SurvivorRatio=6" |