From: maroni Date: Sun, 15 Apr 2012 00:02:03 +0000 (-0300) Subject: Implementação dos registros de Log de eventos! X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=89df9d71c8960ab77c81e389c69c93564ffbc124;p=simdecs2.git Implementação dos registros de Log de eventos! --- diff --git a/nbproject/project.properties b/nbproject/project.properties index d0cf659..679653a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,131 +1,131 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_factory=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -auxiliary.org-netbeans-modules-hudson.builder=http://200.18.67.61/hudson/job/simdecs2/ -auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -file.reference.avalon-framework-4.1.3.jar=lib/avalon-framework-4.1.3.jar -file.reference.commons-fileupload-1.2.2.jar=lib/commons-fileupload-1.2.2.jar -file.reference.commons-io-2.1.jar=lib/commons-io-2.1.jar -file.reference.commons-lang3-3.1.jar=lib/commons-lang3-3.1.jar -file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar -file.reference.icu4j-3.8.jar=lib/icu4j-3.8.jar -file.reference.jade.jar=lib\\jade.jar -file.reference.javahelp-2.0.02.jar=lib/javahelp-2.0.02.jar -file.reference.jaxme2-0.5.1.jar=lib/jaxme2-0.5.1.jar -file.reference.jaxme2-rt-0.5.1.jar=lib/jaxme2-rt-0.5.1.jar -file.reference.jaxmeapi-0.5.1.jar=lib/jaxmeapi-0.5.1.jar -file.reference.jaxmejs-0.5.1.jar=lib/jaxmejs-0.5.1.jar -file.reference.jaxmexs-0.5.1.jar=lib/jaxmexs-0.5.1.jar -file.reference.jpf-1.5.jar=lib/jpf-1.5.jar -file.reference.junit-4.1.jar=lib/junit-4.1.jar -file.reference.log4j-1.2.12.jar=lib/log4j-1.2.12.jar -file.reference.logkit-1.0.1.jar=lib/logkit-1.0.1.jar -file.reference.primefaces-3.1-SNAPSHOT.jar=lib/primefaces-3.1-SNAPSHOT.jar -file.reference.unbbayes-4.10.4-1s.jar=lib/unbbayes-4.10.4-1s.jar -file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar -file.reference.xml-apis-1.0.b2.jar=lib/xml-apis-1.0.b2.jar -includes=** -j2ee.compile.on.save=true -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath=\ - ${libs.hibernate-support.classpath}:\ - ${file.reference.primefaces-3.1-SNAPSHOT.jar}:\ - ${file.reference.avalon-framework-4.1.3.jar}:\ - ${file.reference.commons-fileupload-1.2.2.jar}:\ - ${file.reference.commons-io-2.1.jar}:\ - ${file.reference.commons-lang3-3.1.jar}:\ - ${file.reference.commons-logging-1.1.jar}:\ - ${file.reference.icu4j-3.8.jar}:\ - ${file.reference.javahelp-2.0.02.jar}:\ - ${file.reference.jaxme2-0.5.1.jar}:\ - ${file.reference.jaxme2-rt-0.5.1.jar}:\ - ${file.reference.jaxmeapi-0.5.1.jar}:\ - ${file.reference.jaxmejs-0.5.1.jar}:\ - ${file.reference.jaxmexs-0.5.1.jar}:\ - ${file.reference.jpf-1.5.jar}:\ - ${file.reference.junit-4.1.jar}:\ - ${file.reference.log4j-1.2.12.jar}:\ - ${file.reference.logkit-1.0.1.jar}:\ - ${file.reference.unbbayes-4.10.4-1s.jar}:\ - ${file.reference.xalan-2.7.0.jar}:\ - ${file.reference.xml-apis-1.0.b2.jar}:\ - ${file.reference.jade.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SimDeCS.war -war.name=SimDeCS.war -web.docbase.dir=web -webinf.dir=web/WEB-INF +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=true +annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_factory=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +auxiliary.org-netbeans-modules-hudson.builder=http://200.18.67.61/hudson/job/simdecs2/ +auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets +build.classes.dir=${build.web.dir}/WEB-INF/classes +build.classes.excludes=**/*.java,**/*.form +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +build.web.dir=${build.dir}/web +build.web.excludes=${build.classes.excludes} +client.urlPart= +compile.jsps=false +conf.dir=${source.root}/conf +debug.classpath=${build.classes.dir}:${javac.classpath} +debug.test.classpath=\ + ${run.test.classpath} +display.browser=true +dist.dir=dist +dist.ear.war=${dist.dir}/${war.ear.name} +dist.javadoc.dir=${dist.dir}/javadoc +dist.war=${dist.dir}/${war.name} +endorsed.classpath=\ + ${libs.javaee-endorsed-api-6.0.classpath} +excludes= +file.reference.avalon-framework-4.1.3.jar=lib/avalon-framework-4.1.3.jar +file.reference.commons-fileupload-1.2.2.jar=lib/commons-fileupload-1.2.2.jar +file.reference.commons-io-2.1.jar=lib/commons-io-2.1.jar +file.reference.commons-lang3-3.1.jar=lib/commons-lang3-3.1.jar +file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar +file.reference.icu4j-3.8.jar=lib/icu4j-3.8.jar +file.reference.jade.jar=lib\\jade.jar +file.reference.javahelp-2.0.02.jar=lib/javahelp-2.0.02.jar +file.reference.jaxme2-0.5.1.jar=lib/jaxme2-0.5.1.jar +file.reference.jaxme2-rt-0.5.1.jar=lib/jaxme2-rt-0.5.1.jar +file.reference.jaxmeapi-0.5.1.jar=lib/jaxmeapi-0.5.1.jar +file.reference.jaxmejs-0.5.1.jar=lib/jaxmejs-0.5.1.jar +file.reference.jaxmexs-0.5.1.jar=lib/jaxmexs-0.5.1.jar +file.reference.jpf-1.5.jar=lib/jpf-1.5.jar +file.reference.junit-4.1.jar=lib/junit-4.1.jar +file.reference.log4j-1.2.12.jar=lib/log4j-1.2.12.jar +file.reference.logkit-1.0.1.jar=lib/logkit-1.0.1.jar +file.reference.primefaces-3.1-SNAPSHOT.jar=lib/primefaces-3.1-SNAPSHOT.jar +file.reference.unbbayes-4.10.4-1s.jar=lib/unbbayes-4.10.4-1s.jar +file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar +file.reference.xml-apis-1.0.b2.jar=lib/xml-apis-1.0.b2.jar +includes=** +j2ee.compile.on.save=true +j2ee.deploy.on.save=true +j2ee.platform=1.6-web +j2ee.platform.classpath=${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/jstl-impl.jar +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar +j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar +j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar +j2ee.platform.wsit.classpath= +j2ee.server.type=gfv3ee6 +jar.compress=false +javac.classpath=\ + ${libs.hibernate-support.classpath}:\ + ${file.reference.primefaces-3.1-SNAPSHOT.jar}:\ + ${file.reference.avalon-framework-4.1.3.jar}:\ + ${file.reference.commons-fileupload-1.2.2.jar}:\ + ${file.reference.commons-io-2.1.jar}:\ + ${file.reference.commons-lang3-3.1.jar}:\ + ${file.reference.commons-logging-1.1.jar}:\ + ${file.reference.icu4j-3.8.jar}:\ + ${file.reference.javahelp-2.0.02.jar}:\ + ${file.reference.jaxme2-0.5.1.jar}:\ + ${file.reference.jaxme2-rt-0.5.1.jar}:\ + ${file.reference.jaxmeapi-0.5.1.jar}:\ + ${file.reference.jaxmejs-0.5.1.jar}:\ + ${file.reference.jaxmexs-0.5.1.jar}:\ + ${file.reference.jpf-1.5.jar}:\ + ${file.reference.junit-4.1.jar}:\ + ${file.reference.log4j-1.2.12.jar}:\ + ${file.reference.logkit-1.0.1.jar}:\ + ${file.reference.unbbayes-4.10.4-1s.jar}:\ + ${file.reference.xalan-2.7.0.jar}:\ + ${file.reference.xml-apis-1.0.b2.jar}:\ + ${file.reference.jade.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.debug=true +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.preview=true +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +lib.dir=${web.docbase.dir}/WEB-INF/lib +persistence.xml.dir=${conf.dir} +platform.active=default_platform +resource.dir=setup +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +# Space-separated list of JVM arguments used when running a class with a main method or a unit test +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): +runmain.jvmargs= +source.encoding=UTF-8 +source.root=src +src.dir=${source.root}/java +test.src.dir=test +war.content.additional= +war.ear.name=SimDeCS.war +war.name=SimDeCS.war +web.docbase.dir=web +webinf.dir=web/WEB-INF diff --git a/src/java/org/ufcspa/simdecs/entities/Nodo.java b/src/java/org/ufcspa/simdecs/entities/Nodo.java index ad1046f..1929c78 100644 --- a/src/java/org/ufcspa/simdecs/entities/Nodo.java +++ b/src/java/org/ufcspa/simdecs/entities/Nodo.java @@ -50,6 +50,9 @@ public class Nodo implements Serializable, IdHolder, Comparable { @OneToMany(cascade = javax.persistence.CascadeType.ALL, mappedBy="nodo") private List perguntas; + @Column(length=32767, nullable=true) + private String taticaPedagogica; + @ManyToOne @JoinColumn(name="rede_id", nullable=false) private Rede rede; @@ -160,5 +163,13 @@ public class Nodo implements Serializable, IdHolder, Comparable { return t.getId().intValue() - this.getId().intValue(); } + public String getTaticaPedagogica() { + return taticaPedagogica; + } + + public void setTaticaPedagogica(String taticaPedagogica) { + this.taticaPedagogica = taticaPedagogica; + } + } diff --git a/src/java/org/ufcspa/simdecs/entities/TaticaPedagogica.java b/src/java/org/ufcspa/simdecs/entities/TaticaPedagogica.java new file mode 100644 index 0000000..048b0c3 --- /dev/null +++ b/src/java/org/ufcspa/simdecs/entities/TaticaPedagogica.java @@ -0,0 +1,105 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.ufcspa.simdecs.entities; + +import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * + * @author maroni + */ +@Entity +public class TaticaPedagogica implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @Column(length=10, nullable=false) + private String problema; + + @Column(length=10, nullable=false) + private String estrategia; + + @Column(length=200, nullable=false) + private String assunto; + + @Column(length=32767, nullable=false) + private String mensagem; + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TaticaPedagogica)) { + return false; + } + TaticaPedagogica other = (TaticaPedagogica) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "org.ufcspa.simdecs.entities.TaticaPedagogica[ id=" + id + " ]"; + } + + public String getAssunto() { + return assunto; + } + + public void setAssunto(String assunto) { + this.assunto = assunto; + } + + public String getEstrategia() { + return estrategia; + } + + public void setEstrategia(String estrategia) { + this.estrategia = estrategia; + } + + public String getMensagem() { + return mensagem; + } + + public void setMensagem(String mensagem) { + this.mensagem = mensagem; + } + + public String getProblema() { + return problema; + } + + public void setProblema(String problema) { + this.problema = problema; + } + + + +}