From 80f5897bc81a52e116f82f0cf2be55798cb7d231 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 1 Oct 2014 14:26:24 +0000
Subject: [PATCH] modified app context and db configuration
---
src/java/DmWebPortal/nbproject/build-impl.xml | 2 ++
src/java/DmWebPortal/nbproject/genfiles.properties | 6 +++---
src/java/DmWebPortal/nbproject/project.properties | 2 ++
src/java/DmWebPortal/nbproject/project.xml | 4 ++++
src/java/DmWebPortal/src/conf/persistence.xml | 2 +-
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/java/DmWebPortal/nbproject/build-impl.xml b/src/java/DmWebPortal/nbproject/build-impl.xml
index 077acaf0..516e392b 100644
--- a/src/java/DmWebPortal/nbproject/build-impl.xml
+++ b/src/java/DmWebPortal/nbproject/build-impl.xml
@@ -1024,6 +1024,7 @@ exists or setup the property manually. For example like this:
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
<copyfiles files="${file.reference.itext-2.1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.log4j-1.2.17.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.postgresql-9.3-1102.jdbc41.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.poi-3.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.primefaces-4.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1033,6 +1034,7 @@ exists or setup the property manually. For example like this:
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
<copyfiles files="${file.reference.itext-2.1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.log4j-1.2.17.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.postgresql-9.3-1102.jdbc41.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.poi-3.10.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.primefaces-4.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/src/java/DmWebPortal/nbproject/genfiles.properties b/src/java/DmWebPortal/nbproject/genfiles.properties
index 0656f946..95dfd94b 100644
--- a/src/java/DmWebPortal/nbproject/genfiles.properties
+++ b/src/java/DmWebPortal/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1550eb77
+build.xml.data.CRC32=c6e17de6
build.xml.script.CRC32=6f54d92a
build.xml.stylesheet.CRC32=651128d4@1.65.1.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=1550eb77
-nbproject/build-impl.xml.script.CRC32=4da0fbc4
+nbproject/build-impl.xml.data.CRC32=c6e17de6
+nbproject/build-impl.xml.script.CRC32=953d2855
nbproject/build-impl.xml.stylesheet.CRC32=d659eb7a@1.65.1.1
diff --git a/src/java/DmWebPortal/nbproject/project.properties b/src/java/DmWebPortal/nbproject/project.properties
index ffb1a420..e12da4fe 100644
--- a/src/java/DmWebPortal/nbproject/project.properties
+++ b/src/java/DmWebPortal/nbproject/project.properties
@@ -34,6 +34,7 @@ file.reference.itext-2.1.7.jar=lib/itext-2.1.7.jar
file.reference.log4j-1.2.17.jar=lib/log4j-1.2.17.jar
file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar=lib/org-netbeans-modules-java-j2seproject-copylibstask.jar
file.reference.poi-3.10.jar=lib/poi-3.10.jar
+file.reference.postgresql-9.3-1102.jdbc41.jar=lib/postgresql-9.3-1102.jdbc41.jar
file.reference.primefaces-4.0.jar=lib/primefaces-4.0.jar
includes=**
j2ee.compile.on.save=true
@@ -51,6 +52,7 @@ jar.compress=false
javac.classpath=\
${file.reference.itext-2.1.7.jar}:\
${file.reference.log4j-1.2.17.jar}:\
+ ${file.reference.postgresql-9.3-1102.jdbc41.jar}:\
${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}:\
${file.reference.poi-3.10.jar}:\
${file.reference.primefaces-4.0.jar}
diff --git a/src/java/DmWebPortal/nbproject/project.xml b/src/java/DmWebPortal/nbproject/project.xml
index 1358208e..07966c83 100644
--- a/src/java/DmWebPortal/nbproject/project.xml
+++ b/src/java/DmWebPortal/nbproject/project.xml
@@ -14,6 +14,10 @@
<file>${file.reference.log4j-1.2.17.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
+ <library dirs="200">
+ <file>${file.reference.postgresql-9.3-1102.jdbc41.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
<library dirs="200">
<file>${file.reference.org-netbeans-modules-java-j2seproject-copylibstask.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
diff --git a/src/java/DmWebPortal/src/conf/persistence.xml b/src/java/DmWebPortal/src/conf/persistence.xml
index af625a33..6ed52328 100644
--- a/src/java/DmWebPortal/src/conf/persistence.xml
+++ b/src/java/DmWebPortal/src/conf/persistence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="DmWebPortalPU" transaction-type="JTA">
- <jta-data-source>DmDataSource</jta-data-source>
+ <jta-data-source>dm_DataSource</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties/>
</persistence-unit>
--
GitLab