diff --git a/trunk/WebImages/build.xml b/trunk/WebImages/build.xml new file mode 100644 index 00000000..76801527 --- /dev/null +++ b/trunk/WebImages/build.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + Builds, tests, and runs the project WebImages. + + + diff --git a/trunk/WebImages/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/trunk/WebImages/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar new file mode 100644 index 00000000..0d5f9d10 Binary files /dev/null and b/trunk/WebImages/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ diff --git a/trunk/WebImages/lib/ashwood-2.0.jar b/trunk/WebImages/lib/ashwood-2.0.jar new file mode 100644 index 00000000..55fcc9b1 Binary files /dev/null and b/trunk/WebImages/lib/ashwood-2.0.jar differ diff --git a/trunk/WebImages/lib/avalon-framework-4.2.0.jar b/trunk/WebImages/lib/avalon-framework-4.2.0.jar new file mode 100644 index 00000000..b1aa6d7c Binary files /dev/null and b/trunk/WebImages/lib/avalon-framework-4.2.0.jar differ diff --git a/trunk/WebImages/lib/batik-all-1.7.jar b/trunk/WebImages/lib/batik-all-1.7.jar new file mode 100644 index 00000000..58932858 Binary files /dev/null and b/trunk/WebImages/lib/batik-all-1.7.jar differ diff --git a/trunk/WebImages/lib/commons-codec-1.4.jar b/trunk/WebImages/lib/commons-codec-1.4.jar new file mode 100644 index 00000000..458d432d Binary files /dev/null and b/trunk/WebImages/lib/commons-codec-1.4.jar differ diff --git a/trunk/WebImages/lib/commons-collections-3.1.jar b/trunk/WebImages/lib/commons-collections-3.1.jar new file mode 100644 index 00000000..41e230fe Binary files /dev/null and b/trunk/WebImages/lib/commons-collections-3.1.jar differ diff --git a/trunk/WebImages/lib/commons-httpclient-3.1.jar b/trunk/WebImages/lib/commons-httpclient-3.1.jar new file mode 100755 index 00000000..7c59774a Binary files /dev/null and b/trunk/WebImages/lib/commons-httpclient-3.1.jar differ diff --git a/trunk/WebImages/lib/commons-io-1.4.jar b/trunk/WebImages/lib/commons-io-1.4.jar new file mode 100644 index 00000000..133dc6cb Binary files /dev/null and b/trunk/WebImages/lib/commons-io-1.4.jar differ diff --git a/trunk/WebImages/lib/commons-lang-2.4.jar b/trunk/WebImages/lib/commons-lang-2.4.jar new file mode 100644 index 00000000..532939ec Binary files /dev/null and b/trunk/WebImages/lib/commons-lang-2.4.jar differ diff --git a/trunk/WebImages/lib/commons-logging-1.1.1.jar b/trunk/WebImages/lib/commons-logging-1.1.1.jar new file mode 100644 index 00000000..8758a96b Binary files /dev/null and b/trunk/WebImages/lib/commons-logging-1.1.1.jar differ diff --git a/trunk/WebImages/lib/commons-validator-1.3.1.jar b/trunk/WebImages/lib/commons-validator-1.3.1.jar new file mode 100644 index 00000000..55b12b1a Binary files /dev/null and b/trunk/WebImages/lib/commons-validator-1.3.1.jar differ diff --git a/trunk/WebImages/lib/evologger.jar b/trunk/WebImages/lib/evologger.jar new file mode 100644 index 00000000..f0579f0c Binary files /dev/null and b/trunk/WebImages/lib/evologger.jar differ diff --git a/trunk/WebImages/lib/evolute.jar b/trunk/WebImages/lib/evolute.jar new file mode 100644 index 00000000..c3bcf984 Binary files /dev/null and b/trunk/WebImages/lib/evolute.jar differ diff --git a/trunk/WebImages/lib/junit/junit-3.8.2-api.zip b/trunk/WebImages/lib/junit/junit-3.8.2-api.zip new file mode 100644 index 00000000..6d792fda Binary files /dev/null and b/trunk/WebImages/lib/junit/junit-3.8.2-api.zip differ diff --git a/trunk/WebImages/lib/junit/junit-3.8.2.jar b/trunk/WebImages/lib/junit/junit-3.8.2.jar new file mode 100644 index 00000000..d8358726 Binary files /dev/null and b/trunk/WebImages/lib/junit/junit-3.8.2.jar differ diff --git a/trunk/WebImages/lib/junit_4/junit-4.5-api.zip b/trunk/WebImages/lib/junit_4/junit-4.5-api.zip new file mode 100644 index 00000000..5748c444 Binary files /dev/null and b/trunk/WebImages/lib/junit_4/junit-4.5-api.zip differ diff --git a/trunk/WebImages/lib/junit_4/junit-4.5-src.jar b/trunk/WebImages/lib/junit_4/junit-4.5-src.jar new file mode 100644 index 00000000..18774a57 Binary files /dev/null and b/trunk/WebImages/lib/junit_4/junit-4.5-src.jar differ diff --git a/trunk/WebImages/lib/junit_4/junit-4.5.jar b/trunk/WebImages/lib/junit_4/junit-4.5.jar new file mode 100644 index 00000000..83f8bc79 Binary files /dev/null and b/trunk/WebImages/lib/junit_4/junit-4.5.jar differ diff --git a/trunk/WebImages/lib/log4j-1.2.15.jar b/trunk/WebImages/lib/log4j-1.2.15.jar new file mode 100644 index 00000000..c930a6ab Binary files /dev/null and b/trunk/WebImages/lib/log4j-1.2.15.jar differ diff --git a/trunk/WebImages/lib/nblibraries.properties b/trunk/WebImages/lib/nblibraries.properties new file mode 100644 index 00000000..b1910954 --- /dev/null +++ b/trunk/WebImages/lib/nblibraries.properties @@ -0,0 +1,12 @@ +libs.junit.classpath=\ + ${base}/junit/junit-3.8.2.jar +libs.junit.javadoc=\ + ${base}/junit/junit-3.8.2-api.zip +libs.junit_4.classpath=\ + ${base}/junit_4/junit-4.5.jar +libs.junit_4.javadoc=\ + ${base}/junit_4/junit-4.5-api.zip +libs.junit_4.src=\ + ${base}/junit_4/junit-4.5-src.jar +libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar diff --git a/trunk/WebImages/lib/org.springframework.beans-3.0.0.jar b/trunk/WebImages/lib/org.springframework.beans-3.0.0.jar new file mode 100644 index 00000000..37b9abe7 Binary files /dev/null and b/trunk/WebImages/lib/org.springframework.beans-3.0.0.jar differ diff --git a/trunk/WebImages/lib/org.springframework.context-3.0.0.jar b/trunk/WebImages/lib/org.springframework.context-3.0.0.jar new file mode 100644 index 00000000..7869adbb Binary files /dev/null and b/trunk/WebImages/lib/org.springframework.context-3.0.0.jar differ diff --git a/trunk/WebImages/lib/org.springframework.core-3.0.0.jar b/trunk/WebImages/lib/org.springframework.core-3.0.0.jar new file mode 100644 index 00000000..8f0134ee Binary files /dev/null and b/trunk/WebImages/lib/org.springframework.core-3.0.0.jar differ diff --git a/trunk/WebImages/lib/postgresql-8.2-506.jdbc4.jar b/trunk/WebImages/lib/postgresql-8.2-506.jdbc4.jar new file mode 100644 index 00000000..260a95eb Binary files /dev/null and b/trunk/WebImages/lib/postgresql-8.2-506.jdbc4.jar differ diff --git a/trunk/WebImages/lib/siprpsoft.jar b/trunk/WebImages/lib/siprpsoft.jar new file mode 100644 index 00000000..6d4f7d1f Binary files /dev/null and b/trunk/WebImages/lib/siprpsoft.jar differ diff --git a/trunk/WebImages/lib/spring-ws-core-1.5.9.jar b/trunk/WebImages/lib/spring-ws-core-1.5.9.jar new file mode 100644 index 00000000..8c944048 Binary files /dev/null and b/trunk/WebImages/lib/spring-ws-core-1.5.9.jar differ diff --git a/trunk/WebImages/lib/spring-ws-core-tiger-1.5.9.jar b/trunk/WebImages/lib/spring-ws-core-tiger-1.5.9.jar new file mode 100644 index 00000000..8dabf02e Binary files /dev/null and b/trunk/WebImages/lib/spring-ws-core-tiger-1.5.9.jar differ diff --git a/trunk/WebImages/lib/spring-ws-support-1.5.9.jar b/trunk/WebImages/lib/spring-ws-support-1.5.9.jar new file mode 100644 index 00000000..82796229 Binary files /dev/null and b/trunk/WebImages/lib/spring-ws-support-1.5.9.jar differ diff --git a/trunk/WebImages/lib/spring-xml-1.5.9.jar b/trunk/WebImages/lib/spring-xml-1.5.9.jar new file mode 100644 index 00000000..10a8905b Binary files /dev/null and b/trunk/WebImages/lib/spring-xml-1.5.9.jar differ diff --git a/trunk/WebImages/lib/truelicense.jar b/trunk/WebImages/lib/truelicense.jar new file mode 100644 index 00000000..8c56bd12 Binary files /dev/null and b/trunk/WebImages/lib/truelicense.jar differ diff --git a/trunk/WebImages/lib/xalan-2.7.0.jar b/trunk/WebImages/lib/xalan-2.7.0.jar new file mode 100644 index 00000000..979ee761 Binary files /dev/null and b/trunk/WebImages/lib/xalan-2.7.0.jar differ diff --git a/trunk/WebImages/lib/xercesImpl-2.7.1.jar b/trunk/WebImages/lib/xercesImpl-2.7.1.jar new file mode 100644 index 00000000..eac75ae8 Binary files /dev/null and b/trunk/WebImages/lib/xercesImpl-2.7.1.jar differ diff --git a/trunk/WebImages/lib/xml-apis-1.3.04.jar b/trunk/WebImages/lib/xml-apis-1.3.04.jar new file mode 100644 index 00000000..d42c0ea6 Binary files /dev/null and b/trunk/WebImages/lib/xml-apis-1.3.04.jar differ diff --git a/trunk/WebImages/lib/xml-apis-ext-1.3.04.jar b/trunk/WebImages/lib/xml-apis-ext-1.3.04.jar new file mode 100644 index 00000000..a7869d68 Binary files /dev/null and b/trunk/WebImages/lib/xml-apis-ext-1.3.04.jar differ diff --git a/trunk/WebImages/lib/xmlgraphics-commons-1.3.1.jar b/trunk/WebImages/lib/xmlgraphics-commons-1.3.1.jar new file mode 100644 index 00000000..81a485dc Binary files /dev/null and b/trunk/WebImages/lib/xmlgraphics-commons-1.3.1.jar differ diff --git a/trunk/WebImages/nbproject/ant-deploy.xml b/trunk/WebImages/nbproject/ant-deploy.xml new file mode 100644 index 00000000..a6f1480c --- /dev/null +++ b/trunk/WebImages/nbproject/ant-deploy.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/WebImages/nbproject/build-impl.xml b/trunk/WebImages/nbproject/build-impl.xml new file mode 100644 index 00000000..d02a554c --- /dev/null +++ b/trunk/WebImages/nbproject/build-impl.xml @@ -0,0 +1,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.test.dir + Must set build.dir + Must set build.web.dir + Must set build.generated.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.war + +The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. +Either open the project in the IDE and assign the server or setup the server classpath manually. +For example like this: + ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) +or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +The libs.CopyLibs.classpath property is not set up. +This property must point to +org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part +of NetBeans IDE installation and is usually located at +<netbeans_installation>/java<version>/ant/extra folder. +Either open the project in the IDE and make sure CopyLibs library +exists or setup the property manually. For example like this: + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.jsp.includes + + + + + + + + + + + + + + + + + + + + + + + Must select a file in the IDE or set jsp.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. + + + Launching ${browse.url} + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/WebImages/nbproject/genfiles.properties b/trunk/WebImages/nbproject/genfiles.properties new file mode 100644 index 00000000..d8870265 --- /dev/null +++ b/trunk/WebImages/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=95bbc48a +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.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/WebImages/nbproject/project.properties b/trunk/WebImages/nbproject/project.properties new file mode 100644 index 00000000..b90f4240 --- /dev/null +++ b/trunk/WebImages/nbproject/project.properties @@ -0,0 +1,128 @@ +build.classes.dir=${build.web.dir}/WEB-INF/classes +build.classes.excludes=**/*.java,**/*.form +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +build.web.dir=${build.dir}/web +build.web.excludes=${build.classes.excludes} +client.urlPart= +compile.jsps=false +conf.dir=conf +debug.classpath=${build.classes.dir}:${javac.classpath} +debug.test.classpath=\ + ${run.test.classpath} +display.browser=true +dist.dir=dist +dist.ear.war=${dist.dir}/${war.ear.name} +dist.javadoc.dir=${dist.dir}/javadoc +dist.war=${dist.dir}/${war.name} +excludes= +file.reference.ashwood-2.0.jar=lib/ashwood-2.0.jar +file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar +file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar +file.reference.commons-codec-1.4.jar=lib/commons-codec-1.4.jar +file.reference.commons-collections-3.1.jar=lib/commons-collections-3.1.jar +file.reference.commons-httpclient-3.1.jar=lib/commons-httpclient-3.1.jar +file.reference.commons-io-1.4.jar=lib/commons-io-1.4.jar +file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar +file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar +file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar +file.reference.evologger.jar=lib/evologger.jar +file.reference.evolute.jar=lib/evolute.jar +file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar +file.reference.org.springframework.beans-3.0.0.jar=lib/org.springframework.beans-3.0.0.jar +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-8.2-506.jdbc4.jar=lib/postgresql-8.2-506.jdbc4.jar +file.reference.siprpsoft.jar=lib/siprpsoft.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 +file.reference.spring-xml-1.5.9.jar=lib/spring-xml-1.5.9.jar +file.reference.truelicense.jar=lib/truelicense.jar +file.reference.WebImages-src=src +file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar +file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar +file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar +file.reference.xml-apis-ext-1.3.04.jar=lib/xml-apis-ext-1.3.04.jar +file.reference.xmlgraphics-commons-1.3.1.jar=lib/xmlgraphics-commons-1.3.1.jar +includes=** +j2ee.deploy.on.save=false +j2ee.platform=1.5 +j2ee.server.type=Tomcat60 +jar.compress=false +java.source.based=true +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-collections-3.1.jar}:\ + ${file.reference.evologger.jar}:\ + ${file.reference.evolute.jar}:\ + ${file.reference.log4j-1.2.15.jar}:\ + ${file.reference.postgresql-8.2-506.jdbc4.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}:\ + ${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}:\ + ${file.reference.commons-logging-1.1.1.jar}:\ + ${file.reference.commons-validator-1.3.1.jar}:\ + ${file.reference.org.springframework.context-3.0.0.jar}:\ + ${file.reference.org.springframework.core-3.0.0.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} +# Space-separated list of extra javac options +javac.compilerargs= +javac.debug=true +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.preview=true +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +jspcompilation.classpath=${jspc.classpath}:${javac.classpath} +persistence.xml.dir=${conf.dir} +platform.active=default_platform +resource.dir=setup +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +# Space-separated list of JVM arguments used when running a class with a main method or a unit test +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): +runmain.jvmargs= +source.encoding=UTF-8 +source.root=. +src.dir=${file.reference.WebImages-src} +test.src.dir= +test.test.dir=test +war.content.additional= +war.ear.name=WebImages.war +war.name=WebImages.war +web.docbase.dir=web +webinf.dir=web/WEB-INF diff --git a/trunk/WebImages/nbproject/project.xml b/trunk/WebImages/nbproject/project.xml new file mode 100644 index 00000000..da6317cb --- /dev/null +++ b/trunk/WebImages/nbproject/project.xml @@ -0,0 +1,134 @@ + + + org.netbeans.modules.web.project + + + WebImages + 1.6.5 + + + ${file.reference.ashwood-2.0.jar} + WEB-INF/lib + + + ${file.reference.avalon-framework-4.2.0.jar} + WEB-INF/lib + + + ${file.reference.batik-all-1.7.jar} + WEB-INF/lib + + + ${file.reference.commons-collections-3.1.jar} + WEB-INF/lib + + + ${file.reference.evologger.jar} + WEB-INF/lib + + + ${file.reference.evolute.jar} + WEB-INF/lib + + + ${file.reference.log4j-1.2.15.jar} + WEB-INF/lib + + + ${file.reference.postgresql-8.2-506.jdbc4.jar} + WEB-INF/lib + + + ${file.reference.xalan-2.7.0.jar} + WEB-INF/lib + + + ${file.reference.xercesImpl-2.7.1.jar} + WEB-INF/lib + + + ${file.reference.xml-apis-1.3.04.jar} + WEB-INF/lib + + + ${file.reference.xml-apis-ext-1.3.04.jar} + WEB-INF/lib + + + ${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 + + + ${file.reference.commons-httpclient-3.1.jar} + WEB-INF/lib + + + ${file.reference.commons-lang-2.4.jar} + WEB-INF/lib + + + ${file.reference.commons-logging-1.1.1.jar} + WEB-INF/lib + + + ${file.reference.commons-validator-1.3.1.jar} + WEB-INF/lib + + + ${file.reference.org.springframework.context-3.0.0.jar} + WEB-INF/lib + + + ${file.reference.org.springframework.core-3.0.0.jar} + WEB-INF/lib + + + ${file.reference.spring-ws-core-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.spring-ws-core-tiger-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.spring-ws-support-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.spring-xml-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.commons-codec-1.4.jar} + WEB-INF/lib + + + ${file.reference.commons-io-1.4.jar} + WEB-INF/lib + + + ${file.reference.truelicense.jar} + WEB-INF/lib + + + + + + + + + + + + lib/nblibraries.properties + + + diff --git a/trunk/WebImages/src/siprp/images/servlet/DBConstants.java b/trunk/WebImages/src/siprp/images/servlet/DBConstants.java new file mode 100644 index 00000000..90452e5e --- /dev/null +++ b/trunk/WebImages/src/siprp/images/servlet/DBConstants.java @@ -0,0 +1,25 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.images.servlet; + +/** + * + * @author dneves + */ +public interface DBConstants +{ + +// public static final String SERVER = "evoserver"; +// public static final String PORT = "5432"; + + public static final String SERVER = "localhost"; + public static final String PORT = "5436"; + + public static final String USER = "postgres"; + public static final String PASSWORD = ""; + + public static final String DATABASE = "siprp_local_3"; +} diff --git a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java index 611c4a47..00c24906 100644 --- a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java +++ b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java @@ -1,51 +1,107 @@ package siprp.images.servlet; -import java.io.IOException; +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.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import siprp.database.cayenne.objects.Image; -import siprp.database.cayenne.providers.ImageDAO; +import siprp.data.outer.ImageData; +import siprp.data.provider.ImageDataProvider; public final class ImagesServlet extends HttpServlet { private static final long serialVersionUID = 999506147931075031L; - private static final double MAX_WIDTH = 4.5; - private static final double MAX_HEIGHT = 2.0; +// private static final double MAX_WIDTH = 4.5; +// private static final double MAX_HEIGHT = 2.0; private static final String PARAMETER_ID = "id"; - public void doGet( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException + private static Boolean logger = false; + static + { + if ( ! logger ) + { + WebImagesLogger.init(); + logger = true; + } + } + + public void doGet( HttpServletRequest request, HttpServletResponse response ) //throws IOException, ServletException { response.setContentType( "image/png" ); - ServletOutputStream out = response.getOutputStream(); String param = request.getParameter( PARAMETER_ID ); - System.out.println(param); + + System.out.println( "SIPRPImages . ImagesServlet . doGet() : ImageData.ID = " + param ); + try { - Integer id = new Integer(param); - Image img = new ImageDAO().getImageForID( id ); -// int width = img.getWidth( null ); -// int height = img.getHeight( null ); -// double wrel = ((double)width ) / MAX_WIDTH; -// double hrel = ((double)height ) / MAX_HEIGHT; -// if( wrel > 1 && wrel > hrel ) -// { -// img = img.getScaledInstance( MAX_WIDTH, -1, Image.SCALE_FAST ); -// } -// else if( hrel > 1 && hrel > wrel ) -// { -// img = img.getScaledInstance( -1, MAX_HEIGHT, Image.SCALE_FAST ); -// } - out.write( img.getImageData() ); + 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 ) + { + try + { + Integer imageID = new Integer( param ); + + ImageDataProvider imgProvider = ImageDataProvider.getProvider(); + ImageData img = imgProvider.loadImageDataByID( imageID ); + if ( img != null ) + { + out.write( img.getImage_data() ); + } + } + catch ( Exception e ) + { + ErrorLogger.logException( e ); + } + } + + out.flush(); + out.close(); } - catch (Exception e) { - e.printStackTrace(); + catch ( Exception e ) + { + ErrorLogger.logException( e ); } + + + +// response.setContentType( "image/png" ); +// ServletOutputStream out = response.getOutputStream(); +// String param = request.getParameter( PARAMETER_ID ); +// System.out.println(param); +// try +// { +// Integer id = new Integer( param ); +// Image img = new ImageDAO().getImageForID( id ); +//// int width = img.getWidth( null ); +//// int height = img.getHeight( null ); +//// double wrel = ((double)width ) / MAX_WIDTH; +//// double hrel = ((double)height ) / MAX_HEIGHT; +//// if( wrel > 1 && wrel > hrel ) +//// { +//// img = img.getScaledInstance( MAX_WIDTH, -1, Image.SCALE_FAST ); +//// } +//// else if( hrel > 1 && hrel > wrel ) +//// { +//// img = img.getScaledInstance( -1, MAX_HEIGHT, Image.SCALE_FAST ); +//// } +// out.write( img.getImageData() ); +// } +// catch (Exception e) { +// e.printStackTrace(); +// } } } diff --git a/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java b/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java new file mode 100644 index 00000000..6d8a0dfe --- /dev/null +++ b/trunk/WebImages/src/siprp/images/servlet/WebImagesLogger.java @@ -0,0 +1,35 @@ +package siprp.images.servlet; + +import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.error.LoggerProperties; +import com.evolute.utils.error.ProjectsEnum; +import com.evolute.utils.error.log4j.DBLogger; +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author dneves + */ +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() + { + 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)" ); + // TODO - firewall - must be implemented over http (ws) + ErrorLogger.initializeLogger( new DBLogger( map ) ); + } + +} diff --git a/trunk/WebImages/web/META-INF/context.xml b/trunk/WebImages/web/META-INF/context.xml new file mode 100644 index 00000000..57bfa45b --- /dev/null +++ b/trunk/WebImages/web/META-INF/context.xml @@ -0,0 +1,2 @@ + + diff --git a/trunk/WebImages/web/WEB-INF/web.xml b/trunk/WebImages/web/WEB-INF/web.xml new file mode 100644 index 00000000..8a856d65 --- /dev/null +++ b/trunk/WebImages/web/WEB-INF/web.xml @@ -0,0 +1,19 @@ + + + + + + + + siprp.images.servlet.ImagesServlet + imageServlet + + + + imageServlet + /image + + +