From f1b170a5712bf17328107a5570ae5dcb737407e9 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Fri, 20 Aug 2010 13:09:45 +0000 Subject: [PATCH] real netbeans java web project. git-svn-id: https://svn.coded.pt/svn/SIPRP@1402 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/WebImages/lib/siprpsoft.jar | Bin 2050752 -> 2049709 bytes trunk/WebImages/nbproject/build-impl.xml | 6 +- trunk/WebImages/nbproject/genfiles.properties | 6 +- trunk/WebImages/nbproject/project.properties | 4 +- trunk/WebImages/nbproject/project.xml | 8 +-- .../images/servlet/ImageDataProvider.java | 59 ++++++++++++++++++ .../siprp/images/servlet/ImagesServlet.java | 11 ---- 7 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 trunk/WebImages/src/siprp/images/servlet/ImageDataProvider.java diff --git a/trunk/WebImages/lib/siprpsoft.jar b/trunk/WebImages/lib/siprpsoft.jar index 6d4f7d1f2f1f384dcba62be59f6184149583fa8f..e39630db66dcd32aa147e364e046d4e591751e27 100644 GIT binary patch delta 31747 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 Dn{9uB delta 32692 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 - @@ -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 )