relocate project db,

fix web.xml,
update libs,
fix warning

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

trunk/WebImages/.classpath

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/ashwood-2.0.jar"/>
@@ -30,7 +20,6 @@
 	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.beans-3.0.0.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.context-3.0.0.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.core-3.0.0.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/shst.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-ws-core-1.5.9.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-ws-core-tiger-1.5.9.jar"/>
@@ -42,5 +31,16 @@
 	<classpathentry kind="lib" path="web/WEB-INF/lib/xml-apis-1.3.04.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/xmlgraphics-commons-1.3.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_51]">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/postgresql-9.2-1002.jdbc4.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

trunk/WebImages/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

trunk/WebImages/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

trunk/WebImages/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v6.0"/>
+  <runtime name="Apache Tomcat v7.0"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
   <fixed facet="jst.web"/>

trunk/WebImages/.settings/org.eclipse.wst.ws.service.policy.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false

trunk/WebImages/src/siprp/images/servlet/DBConstants.java

@@ -13,10 +13,10 @@ public interface DBConstants
 {
 	// production
 	public static final String SERVER = "localhost";
-	public static final String PORT = "5436";
+	public static final String PORT = "5432";
 
-	public static final String USER = "postgres";
-	public static final String PASSWORD = "";
+	public static final String USER = "siprp";
+	public static final String PASSWORD = "-rg2hpgsql";
 
 	public static final String DATABASE = "siprp_local_3";
 

trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java

@@ -10,6 +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 shst.data.outer.ImageData;
 
 /**
@@ -22,6 +23,7 @@ public class ImageDataProvider
 
 	private ProviderInterface< Persistent< ? >, Exception > ENTITY_PROVIDER = null;
 
+	@SuppressWarnings("unchecked")
 	private ImageDataProvider() throws Exception
 	{
 		if ( Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER ) == null )

trunk/WebImages/web/WEB-INF/web.xml

@@ -1,12 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>SIPRPImages</display-name>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+
+<web-app>
+
+  <servlet>
+    <servlet-name>imageServlet</servlet-name>
+    <servlet-class>siprp.images.servlet.ImagesServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>imageServlet</servlet-name>
+    <url-pattern>/image</url-pattern>
+  </servlet-mapping>
+
+</web-app>