diff --git a/trunk/WebImages/lib/evologger.jar b/trunk/WebImages/lib/evologger.jar
index dc2e8467..1f741c12 100644
Binary files a/trunk/WebImages/lib/evologger.jar and b/trunk/WebImages/lib/evologger.jar differ
diff --git a/trunk/WebImages/lib/evolute.jar b/trunk/WebImages/lib/evolute.jar
index 6e49671b..0c503cae 100644
Binary files a/trunk/WebImages/lib/evolute.jar and b/trunk/WebImages/lib/evolute.jar differ
diff --git a/trunk/WebImages/lib/shst.jar b/trunk/WebImages/lib/shst.jar
new file mode 100644
index 00000000..95e5fdd7
Binary files /dev/null and b/trunk/WebImages/lib/shst.jar differ
diff --git a/trunk/WebImages/lib/siprpsoft.jar b/trunk/WebImages/lib/siprpsoft.jar
deleted file mode 100644
index e39630db..00000000
Binary files a/trunk/WebImages/lib/siprpsoft.jar and /dev/null differ
diff --git a/trunk/WebImages/nbproject/build-impl.xml b/trunk/WebImages/nbproject/build-impl.xml
index a94944c1..04bfe0b9 100644
--- a/trunk/WebImages/nbproject/build-impl.xml
+++ b/trunk/WebImages/nbproject/build-impl.xml
@@ -540,67 +540,67 @@ exists or setup the property manually. For example like this:
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/trunk/WebImages/nbproject/genfiles.properties b/trunk/WebImages/nbproject/genfiles.properties
index 597f407f..c811c882 100644
--- a/trunk/WebImages/nbproject/genfiles.properties
+++ b/trunk/WebImages/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e742761c
+build.xml.data.CRC32=4eeb4b3c
build.xml.script.CRC32=04f3d76d
build.xml.stylesheet.CRC32=c0ebde35@1.15.2.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=e742761c
-nbproject/build-impl.xml.script.CRC32=8a967cde
+nbproject/build-impl.xml.data.CRC32=4eeb4b3c
+nbproject/build-impl.xml.script.CRC32=bf132b9a
nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1
diff --git a/trunk/WebImages/nbproject/project.properties b/trunk/WebImages/nbproject/project.properties
index f291aaa2..02ab6c20 100644
--- a/trunk/WebImages/nbproject/project.properties
+++ b/trunk/WebImages/nbproject/project.properties
@@ -37,7 +37,7 @@ file.reference.org.springframework.beans-3.0.0.jar=lib/org.springframework.beans
file.reference.org.springframework.context-3.0.0.jar=lib/org.springframework.context-3.0.0.jar
file.reference.org.springframework.core-3.0.0.jar=lib/org.springframework.core-3.0.0.jar
file.reference.postgresql-9.0-801.jdbc4.jar=lib/postgresql-9.0-801.jdbc4.jar
-file.reference.siprpsoft.jar=lib/siprpsoft.jar
+file.reference.shst.jar=lib/shst.jar
file.reference.spring-ws-core-1.5.9.jar=lib/spring-ws-core-1.5.9.jar
file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar
file.reference.spring-ws-support-1.5.9.jar=lib/spring-ws-support-1.5.9.jar
@@ -59,32 +59,32 @@ javac.classpath=\
${file.reference.ashwood-2.0.jar}:\
${file.reference.avalon-framework-4.2.0.jar}:\
${file.reference.batik-all-1.7.jar}:\
+ ${file.reference.commons-codec-1.4.jar}:\
${file.reference.commons-collections-3.1.jar}:\
- ${file.reference.evologger.jar}:\
- ${file.reference.evolute.jar}:\
- ${file.reference.log4j-1.2.15.jar}:\
- ${file.reference.xalan-2.7.0.jar}:\
- ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
- ${file.reference.xercesImpl-2.7.1.jar}:\
- ${file.reference.xml-apis-1.3.04.jar}:\
- ${file.reference.xml-apis-ext-1.3.04.jar}:\
- ${file.reference.xmlgraphics-commons-1.3.1.jar}:\
- ${file.reference.org.springframework.beans-3.0.0.jar}:\
${file.reference.commons-httpclient-3.1.jar}:\
+ ${file.reference.commons-io-1.4.jar}:\
${file.reference.commons-lang-2.4.jar}:\
${file.reference.commons-logging-1.1.1.jar}:\
${file.reference.commons-validator-1.3.1.jar}:\
+ ${file.reference.evologger.jar}:\
+ ${file.reference.evolute.jar}:\
+ ${file.reference.jdom-1.1.1.jar}:\
+ ${file.reference.log4j-1.2.15.jar}:\
+ ${file.reference.org.springframework.beans-3.0.0.jar}:\
${file.reference.org.springframework.context-3.0.0.jar}:\
${file.reference.org.springframework.core-3.0.0.jar}:\
+ ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
+ ${file.reference.shst.jar}:\
${file.reference.spring-ws-core-1.5.9.jar}:\
${file.reference.spring-ws-core-tiger-1.5.9.jar}:\
${file.reference.spring-ws-support-1.5.9.jar}:\
${file.reference.spring-xml-1.5.9.jar}:\
- ${file.reference.commons-codec-1.4.jar}:\
- ${file.reference.commons-io-1.4.jar}:\
${file.reference.truelicense.jar}:\
- ${file.reference.siprpsoft.jar}:\
- ${file.reference.jdom-1.1.1.jar}
+ ${file.reference.xalan-2.7.0.jar}:\
+ ${file.reference.xercesImpl-2.7.1.jar}:\
+ ${file.reference.xml-apis-1.3.04.jar}:\
+ ${file.reference.xml-apis-ext-1.3.04.jar}:\
+ ${file.reference.xmlgraphics-commons-1.3.1.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
diff --git a/trunk/WebImages/nbproject/project.xml b/trunk/WebImages/nbproject/project.xml
index 50da524a..fb48258a 100644
--- a/trunk/WebImages/nbproject/project.xml
+++ b/trunk/WebImages/nbproject/project.xml
@@ -19,71 +19,67 @@
WEB-INF/lib
- ${file.reference.commons-collections-3.1.jar}
- WEB-INF/lib
-
-
- ${file.reference.evologger.jar}
+ ${file.reference.commons-codec-1.4.jar}
WEB-INF/lib
- ${file.reference.evolute.jar}
+ ${file.reference.commons-collections-3.1.jar}
WEB-INF/lib
- ${file.reference.log4j-1.2.15.jar}
+ ${file.reference.commons-httpclient-3.1.jar}
WEB-INF/lib
- ${file.reference.xalan-2.7.0.jar}
+ ${file.reference.commons-io-1.4.jar}
WEB-INF/lib
- ${file.reference.postgresql-9.0-801.jdbc4.jar}
+ ${file.reference.commons-lang-2.4.jar}
WEB-INF/lib
- ${file.reference.xercesImpl-2.7.1.jar}
+ ${file.reference.commons-logging-1.1.1.jar}
WEB-INF/lib
- ${file.reference.xml-apis-1.3.04.jar}
+ ${file.reference.commons-validator-1.3.1.jar}
WEB-INF/lib
- ${file.reference.xml-apis-ext-1.3.04.jar}
+ ${file.reference.evologger.jar}
WEB-INF/lib
- ${file.reference.xmlgraphics-commons-1.3.1.jar}
+ ${file.reference.evolute.jar}
WEB-INF/lib
- ${file.reference.org.springframework.beans-3.0.0.jar}
+ ${file.reference.jdom-1.1.1.jar}
WEB-INF/lib
- ${file.reference.commons-httpclient-3.1.jar}
+ ${file.reference.log4j-1.2.15.jar}
WEB-INF/lib
- ${file.reference.commons-lang-2.4.jar}
+ ${file.reference.org.springframework.beans-3.0.0.jar}
WEB-INF/lib
- ${file.reference.commons-logging-1.1.1.jar}
+ ${file.reference.org.springframework.context-3.0.0.jar}
WEB-INF/lib
- ${file.reference.commons-validator-1.3.1.jar}
+ ${file.reference.org.springframework.core-3.0.0.jar}
WEB-INF/lib
- ${file.reference.org.springframework.context-3.0.0.jar}
+ ${file.reference.postgresql-9.0-801.jdbc4.jar}
WEB-INF/lib
- ${file.reference.org.springframework.core-3.0.0.jar}
+ ${file.reference.shst.jar}
WEB-INF/lib
@@ -103,23 +99,27 @@
WEB-INF/lib
- ${file.reference.commons-codec-1.4.jar}
+ ${file.reference.truelicense.jar}
WEB-INF/lib
- ${file.reference.commons-io-1.4.jar}
+ ${file.reference.xalan-2.7.0.jar}
WEB-INF/lib
- ${file.reference.truelicense.jar}
+ ${file.reference.xercesImpl-2.7.1.jar}
+ WEB-INF/lib
+
+
+ ${file.reference.xml-apis-1.3.04.jar}
WEB-INF/lib
- ${file.reference.siprpsoft.jar}
+ ${file.reference.xml-apis-ext-1.3.04.jar}
WEB-INF/lib
- ${file.reference.jdom-1.1.1.jar}
+ ${file.reference.xmlgraphics-commons-1.3.1.jar}
WEB-INF/lib
diff --git a/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java b/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java
index 130f48b0..b4251c51 100644
--- a/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java
+++ b/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java
@@ -10,7 +10,7 @@ import com.evolute.entity.ProviderInterface;
import com.evolute.utils.Singleton;
import com.evolute.utils.dataedition.persistence.Persistent;
import com.evolute.utils.error.ErrorLogger;
-import siprp.data.outer.ImageData;
+import shst.data.outer.ImageData;
/**
*
diff --git a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
index 05615c20..eca7f881 100644
--- a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
+++ b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
@@ -6,7 +6,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import siprp.data.outer.ImageData;
+import shst.data.outer.ImageData;
public final class ImagesServlet extends HttpServlet
{
diff --git a/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java b/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java
index 5ace1398..085b8540 100644
--- a/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java
+++ b/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java
@@ -1,11 +1,12 @@
package siprp.images.servlet;
import com.evolute.utils.error.ErrorLogger;
+import com.evolute.utils.error.Logger;
import com.evolute.utils.error.LoggerProperties;
import com.evolute.utils.error.ProjectsEnum;
import com.evolute.utils.error.ws.WSLogger;
+import com.evolute.utils.network.proxy.EvoProxyObject;
import java.util.HashMap;
-import java.util.Map;
/**
*
@@ -14,29 +15,25 @@ import java.util.Map;
public class WebImagesLogger
{
- private static String EVO_LOGGER_DB = "jdbc:postgresql://www.evolute.pt:5436/evo_logging?logUnclosedConnections=true&loginTimeout=5&socketTimeout=5&tcpKeepAlive=true";
- private static String EVO_LOGGER_USER = "evo_logger";
- private static String EVO_LOGGER_PASSWD = "2DD-rg2hLOG";
-
- public static void init()
+ public static void init() throws Exception
{
- Map< LoggerProperties, String > map = new HashMap< LoggerProperties, String >();
- map.put( LoggerProperties.USERNAME, EVO_LOGGER_USER );
- map.put( LoggerProperties.PASSWORD, EVO_LOGGER_PASSWD );
- map.put( LoggerProperties.URL, EVO_LOGGER_DB );
- map.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() );
- map.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() );
- map.put( LoggerProperties.SOFTWARE_VERSION, "1.1" );
- map.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao : SIPRPImages (WebImages)" );
+ HashMap< LoggerProperties, String > properties = new HashMap< LoggerProperties, String >();
+ properties.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao : SIPRPImages (WebImages)" );
+ properties.put( LoggerProperties.SOFTWARE_VERSION, "1.1" );
+ properties.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() );
+ properties.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() );
+ properties.put( LoggerProperties.PROJECT_VERSION, "1.1" );
+
+ String user = "";
+ String pass = "";
+ String host = "";
+ String port = "";
+
+ EvoProxyObject.configSystemProxySelector();
+ EvoProxyObject.getProxy( user, pass, host, port );
- try
- {
- ErrorLogger.initializeLogger( new WSLogger( map ) );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ Logger logger = new WSLogger( properties );
+ ErrorLogger.initializeLogger( logger );
}
}