From 6f71c512569f73bb18462307dc0ed94afa2d31fc Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sat, 15 Mar 2008 19:24:23 +0000 Subject: [PATCH 1/1] putting the hibernate-jpa dependencies in a separate project. --- hibernate-jpa/pom.xml | 46 ++++++++++++++++++ mythtv/ear/pom.xml | 4 -- mythtv/monitor/pom.xml | 9 +--- .../resources/org.wamblee.mythtv.properties | 8 ++-- pom.xml | 48 ++++++++----------- support/pom.xml | 8 +--- 6 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 hibernate-jpa/pom.xml diff --git a/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml new file mode 100644 index 00000000..ac373914 --- /dev/null +++ b/hibernate-jpa/pom.xml @@ -0,0 +1,46 @@ + + + + org.wamblee + wamblee-utils + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + wamblee-hibernate-jpa + jar + wamblee.org hibernate-jpa library (bundling the required dependencies) + http://wamblee.org + + + org.hibernate + hibernate + 3.2.5.ga + + + org.hibernate + hibernate-entitymanager + 3.3.1.ga + + + javax.persistence + persistence-api + 1.0 + provided + + + concurrent + concurrent + 1.3.4 + + + oro + oro + 2.0.6 + + + + diff --git a/mythtv/ear/pom.xml b/mythtv/ear/pom.xml index a1e1aa80..81746141 100644 --- a/mythtv/ear/pom.xml +++ b/mythtv/ear/pom.xml @@ -33,10 +33,6 @@ ${project.version} ejb - - org.hibernate - hibernate-entitymanager - diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml index 03fa2edd..03dd8fb8 100644 --- a/mythtv/monitor/pom.xml +++ b/mythtv/monitor/pom.xml @@ -33,13 +33,8 @@ spring-jpa - concurrent - concurrent - - - log4j - log4j - provided + org.wamblee + wamblee-hibernate-jpa javaee diff --git a/mythtv/war/src/main/resources/org.wamblee.mythtv.properties b/mythtv/war/src/main/resources/org.wamblee.mythtv.properties index 85f9a0e8..0b3a0b6c 100644 --- a/mythtv/war/src/main/resources/org.wamblee.mythtv.properties +++ b/mythtv/war/src/main/resources/org.wamblee.mythtv.properties @@ -1,8 +1,8 @@ org.wamblee.mythtv.datasource=jdbc/mythtv org.wamblee.mythtv.pollinterval=120 -org.wamblee.mythtv.monitordir=/data/vcr -org.wamblee.mythtv.linkdir=/data/vcr/links +#org.wamblee.mythtv.monitordir=/data/vcr +#org.wamblee.mythtv.linkdir=/data/vcr/links -#org.wamblee.mythtv.monitordir=/ext/home/erik/java/workspace/utils/mythtv/testdata/input -#org.wamblee.mythtv.linkdir=/ext/home/erik/java/workspace/utils/mythtv/testdata/links +org.wamblee.mythtv.monitordir=/ext/home/erik/java/workspace/utils/mythtv/testdata/input +org.wamblee.mythtv.linkdir=/ext/home/erik/java/workspace/utils/mythtv/testdata/links diff --git a/pom.xml b/pom.xml index d6761652..8bdc37e3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ http://wamblee.org support + hibernate-jpa socketproxy crawler gps @@ -55,6 +56,17 @@ test-jar ${project.version} + + org.wamblee + wamblee-hibernate-jpa + ${project.version} + + + org.wamblee + wamblee-hibernate-jpa + ${project.version} + test-jar + org.wamblee wamblee-socketproxy @@ -89,6 +101,12 @@ ${project.version} + + javax.persistence + persistence-api + 1.0 + provided + javax.servlet servlet-api @@ -122,17 +140,7 @@ 4aug2000r7-dev - - concurrent - concurrent - 1.3.4 - - - - oro - oro - 2.0.6 - + commons-logging commons-logging @@ -211,22 +219,8 @@ xercesImpl 2.8.1 - - org.hibernate - hibernate - 3.2.5.ga - - - org.hibernate - hibernate-entitymanager - 3.3.1.ga - - - javax.persistence - persistence-api - 1.0 - provided - + + commons-email commons-email diff --git a/support/pom.xml b/support/pom.xml index 6d7a421b..a57a26af 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -68,17 +68,13 @@ xercesImpl - org.hibernate - hibernate + org.wamblee + wamblee-hibernate-jpa jaxen jaxen - - oro - oro - -- 2.31.1