putting the hibernate-jpa dependencies in a separate project.

diff --git a/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml
new file mode 100644 (file)
index 0000000..ac37391
--- /dev/null
+++ b/hibernate-jpa/pom.xml
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.wamblee</groupId>
+    <artifactId>wamblee-utils</artifactId>
+    <version>0.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.wamblee</groupId>
+  <artifactId>wamblee-hibernate-jpa</artifactId>
+  <packaging>jar</packaging>
+  <name>wamblee.org hibernate-jpa library (bundling the required dependencies)</name>
+  <url>http://wamblee.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+      <version>3.2.5.ga</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.3.1.ga</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>persistence-api</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/mythtv/ear/pom.xml b/mythtv/ear/pom.xml
index a1e1aa802fa1c29fc1f35a1ced7115feac4cd8eb..8174614155b1d1336d7fa7d9bf51e44415a4bfcb 100644 (file)
--- a/mythtv/ear/pom.xml
+++ b/mythtv/ear/pom.xml
@@ -33,10 +33,6 @@
         <version>${project.version}</version>
         <type>ejb</type>
     </dependency>
-    <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-entitymanager</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml
index 03fa2edda744c186143deaba3a753a439c4ae6db..03dd8fb88e7d2f312744e8b06230ce1e4883b304 100644 (file)
--- a/mythtv/monitor/pom.xml
+++ b/mythtv/monitor/pom.xml
@@ -33,13 +33,8 @@
       <artifactId>spring-jpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
+      <groupId>org.wamblee</groupId>
+      <artifactId>wamblee-hibernate-jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>javaee</groupId>

diff --git a/mythtv/war/src/main/resources/org.wamblee.mythtv.properties b/mythtv/war/src/main/resources/org.wamblee.mythtv.properties
index 85f9a0e88d6f9af65924cde26669e9d075ae626e..0b3a0b6c4def8ee2b4e66af445b38cdf384a312f 100644 (file)
--- 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 d676165208ba9da2410624e9c080016fb9cac4bb..8bdc37e32616256148fed722602eadcc4b594908 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
   <url>http://wamblee.org</url>
   <modules>
     <module>support</module>
+    <module>hibernate-jpa</module>
     <module>socketproxy</module>
     <module>crawler</module>
     <module>gps</module>
@@ -55,6 +56,17 @@
         <type>test-jar</type>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.wamblee</groupId>
+        <artifactId>wamblee-hibernate-jpa</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.wamblee</groupId>
+        <artifactId>wamblee-hibernate-jpa</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+      </dependency>
       <dependency>
         <groupId>org.wamblee</groupId>
         <artifactId>wamblee-socketproxy</artifactId>
@@ -89,6 +101,12 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>javax.persistence</groupId>
+        <artifactId>persistence-api</artifactId>
+        <version>1.0</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
@@ -122,17 +140,7 @@
         <version>4aug2000r7-dev</version>
       </dependency>
 
-      <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>1.3.4</version>
-      </dependency>
-
-      <dependency>
-        <groupId>oro</groupId>
-        <artifactId>oro</artifactId>
-        <version>2.0.6</version>
-      </dependency>
+    
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
@@ -211,22 +219,8 @@
         <artifactId>xercesImpl</artifactId>
         <version>2.8.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate</artifactId>
-        <version>3.2.5.ga</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-entitymanager</artifactId>
-        <version>3.3.1.ga</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.persistence</groupId>
-        <artifactId>persistence-api</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
-      </dependency>
+     
+     
       <dependency>
         <groupId>commons-email</groupId>
         <artifactId>commons-email</artifactId>

diff --git a/support/pom.xml b/support/pom.xml
index 6d7a421b49487674c3f619bce45ba61dae68525a..a57a26af1a93be52ad64d717ea083da3c1e8a570 100644 (file)
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -68,17 +68,13 @@
       <artifactId>xercesImpl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
+      <groupId>org.wamblee</groupId>
+      <artifactId>wamblee-hibernate-jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
     </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
 
   </dependencies>