From: maroni <maroni@192.168.1.103>
Date: Mon, 21 May 2012 20:32:06 +0000 (-0300)
Subject: Nova versao do simulador e tratamento de erros das chamadas.
X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=aed9d7225c67dd9d48e88fb8e16495e4fc8a366e;p=simdecs2.git

Nova versao do simulador e tratamento de erros das chamadas.
---

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index e203e06..3d76080 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -695,8 +695,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.xml-apis-1.0.b2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jade.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.javax.faces.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.javax.servlet-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -723,8 +721,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xml-apis-1.0.b2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jade.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.javax.faces.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.javax.servlet-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index b90973a..8926f6f 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=15481bc4
+build.xml.data.CRC32=9cef979c
 build.xml.script.CRC32=9f680c47
 build.xml.stylesheet.CRC32=651128d4@1.36.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=15481bc4
-nbproject/build-impl.xml.script.CRC32=8f7ed2c6
+nbproject/build-impl.xml.data.CRC32=9cef979c
+nbproject/build-impl.xml.script.CRC32=9fe94479
 nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 082d4c4..922f216 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -37,8 +37,6 @@ 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.javax.faces.jar=lib/javax.faces.jar
-file.reference.javax.servlet-api.jar=lib/javax.servlet-api.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
@@ -86,9 +84,7 @@ javac.classpath=\
     ${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}:\
-    ${file.reference.javax.faces.jar}:\
-    ${file.reference.javax.servlet-api.jar}
+    ${file.reference.jade.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 3e13115..0f5d405 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -94,14 +94,6 @@
                     <file>${file.reference.jade.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.javax.faces.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.javax.servlet-api.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
diff --git a/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java b/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java
index dfdf8de..eec00b0 100644
--- a/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java
+++ b/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java
@@ -15,7 +15,7 @@ public class CharacterEncodingFilter implements Filter, Serializable
     @Override
     public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
         req.setCharacterEncoding("UTF-8");
-//        resp.setCharacterEncoding("UTF-8");
+        resp.setCharacterEncoding("UTF-8");
         chain.doFilter(req, resp);
     }
 
diff --git a/src/java/org/ufcspa/simdecs/util/UnBBayesUtil.java b/src/java/org/ufcspa/simdecs/util/UnBBayesUtil.java
index 6f547df..3b9d9fc 100644
--- a/src/java/org/ufcspa/simdecs/util/UnBBayesUtil.java
+++ b/src/java/org/ufcspa/simdecs/util/UnBBayesUtil.java
@@ -40,7 +40,7 @@ if (redeEntity != null)
         // required to run unbbayes gui classes on server
         System.setProperty("java.awt.headless", "false"); 
 System.out.println("PONTO 1");
-//        rede = new ProbabilisticNetwork("rede"+redeEntity.getId());
+        rede = new ProbabilisticNetwork("rede"+redeEntity.getId());
         
 System.out.println("PONTO 2");
         XMLBIFIO.loadXML(new File(redeEntity.getArquivo()), rede);