diff --git a/trunk/WebImages/lib/siprpsoft.jar b/trunk/WebImages/lib/siprpsoft.jar
index 6d4f7d1f..e39630db 100644
Binary files a/trunk/WebImages/lib/siprpsoft.jar and b/trunk/WebImages/lib/siprpsoft.jar differ
diff --git a/trunk/WebImages/nbproject/build-impl.xml b/trunk/WebImages/nbproject/build-impl.xml
index d02a554c..09b32045 100644
--- a/trunk/WebImages/nbproject/build-impl.xml
+++ b/trunk/WebImages/nbproject/build-impl.xml
@@ -550,7 +550,6 @@ exists or setup the property manually. For example like this:
-
@@ -565,9 +564,10 @@ exists or setup the property manually. For example like this:
+
-
+
@@ -584,7 +584,6 @@ exists or setup the property manually. For example like this:
-
@@ -599,6 +598,7 @@ 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 d8870265..5f37f164 100644
--- a/trunk/WebImages/nbproject/genfiles.properties
+++ b/trunk/WebImages/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=95bbc48a
+build.xml.data.CRC32=d81d303c
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=95bbc48a
-nbproject/build-impl.xml.script.CRC32=91c20735
+nbproject/build-impl.xml.data.CRC32=d81d303c
+nbproject/build-impl.xml.script.CRC32=25989aa0
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 b90f4240..6b38c156 100644
--- a/trunk/WebImages/nbproject/project.properties
+++ b/trunk/WebImages/nbproject/project.properties
@@ -68,7 +68,6 @@ javac.classpath=\
${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.siprpsoft.jar}:\
${file.reference.org.springframework.beans-3.0.0.jar}:\
${file.reference.commons-httpclient-3.1.jar}:\
${file.reference.commons-lang-2.4.jar}:\
@@ -82,7 +81,8 @@ javac.classpath=\
${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.truelicense.jar}:\
+ ${file.reference.siprpsoft.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 da6317cb..71b26db4 100644
--- a/trunk/WebImages/nbproject/project.xml
+++ b/trunk/WebImages/nbproject/project.xml
@@ -58,10 +58,6 @@
${file.reference.xmlgraphics-commons-1.3.1.jar}
WEB-INF/lib
-
- ${file.reference.siprpsoft.jar}
- WEB-INF/lib
-
${file.reference.org.springframework.beans-3.0.0.jar}
WEB-INF/lib
@@ -118,6 +114,10 @@
${file.reference.truelicense.jar}
WEB-INF/lib
+
+ ${file.reference.siprpsoft.jar}
+ WEB-INF/lib
+
diff --git a/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java b/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java
new file mode 100644
index 00000000..130f48b0
--- /dev/null
+++ b/trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java
@@ -0,0 +1,59 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package siprp.images.servlet;
+
+import com.evolute.application.initializer.DefaultDatabaseInitializer;
+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;
+
+/**
+ *
+ * @author dneves
+ */
+public class ImageDataProvider
+{
+ private static ImageDataProvider INSTANCE = null;
+
+ private ProviderInterface< Persistent< ? >, Exception > ENTITY_PROVIDER = null;
+
+ private ImageDataProvider() throws Exception
+ {
+ if ( Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER ) == null )
+ {
+ new DefaultDatabaseInitializer( DBConstants.SERVER, DBConstants.PORT, DBConstants.DATABASE,
+ DBConstants.USER, DBConstants.PASSWORD ).doInit();
+ }
+
+ ENTITY_PROVIDER = ( ProviderInterface< Persistent< ? >, Exception > ) Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER );
+ }
+
+ public static synchronized ImageDataProvider getProvider() throws Exception
+ {
+ if ( INSTANCE == null )
+ {
+ INSTANCE = new ImageDataProvider();
+ }
+ return INSTANCE;
+ }
+
+ public ImageData loadImageDataByID( Integer imageID )
+ {
+ ImageData result = null;
+ try
+ {
+ result = ENTITY_PROVIDER.load( ImageData.class, imageID, ImageData.ID );
+ }
+ catch ( Exception e )
+ {
+ ErrorLogger.logException( e );
+ }
+ return result;
+ }
+
+}
diff --git a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
index 00c24906..1c5a771f 100644
--- a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
+++ b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java
@@ -1,8 +1,5 @@
package siprp.images.servlet;
-import com.evolute.application.initializer.DefaultDatabaseInitializer;
-import com.evolute.entity.ProviderInterface;
-import com.evolute.utils.Singleton;
import com.evolute.utils.error.ErrorLogger;
import javax.servlet.ServletOutputStream;
@@ -10,7 +7,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import siprp.data.outer.ImageData;
-import siprp.data.provider.ImageDataProvider;
public final class ImagesServlet extends HttpServlet
{
@@ -39,13 +35,6 @@ public final class ImagesServlet extends HttpServlet
try
{
- ProviderInterface prov = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER );
- if ( prov == null )
- {
- new DefaultDatabaseInitializer( DBConstants.SERVER, DBConstants.PORT, DBConstants.DATABASE,
- DBConstants.USER, DBConstants.PASSWORD ).doInit();
- }
-
ServletOutputStream out = response.getOutputStream();
if ( param != null )