(no commit message)

diff --git a/mythtv/ear/pom.xml b/mythtv/ear/pom.xml
index c7b7cc9baf3e5612c787860f003bbfb85d909042..da812ad3ff3710a955d9c7f53ff0e67afb616633 100644 (file)
--- a/mythtv/ear/pom.xml
+++ b/mythtv/ear/pom.xml
@@ -22,6 +22,22 @@
         <version>${project.version}</version>
         <type>war</type>
     </dependency>
+    <dependency>
+        <groupId>org.wamblee</groupId>
+        <artifactId>wamblee-mythtv-monitor</artifactId>
+        <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-ear-plugin</artifactId>
+        <configuration>
+          <defaultJavaBundleDir>lib/</defaultJavaBundleDir>
+        </configuration>       
+      </plugin>
+    </plugins>    
+  </build>
+
 </project>

diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml
index 72602923f587be0547498b0787a632f94bad9854..658d67240a9fec7f220184ad1ac01944f0d7c7c1 100644 (file)
--- a/mythtv/monitor/pom.xml
+++ b/mythtv/monitor/pom.xml
@@ -11,7 +11,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.wamblee</groupId>
   <artifactId>wamblee-mythtv-monitor</artifactId>
-  <packaging>war</packaging>
+  <packaging>jar</packaging>
   <name>wamblee.org mythtv directory monitor MONITOR</name>
   <url>http://wamblee.org</url>
   

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/Application.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/Application.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/Channel.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Channel.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/Channel.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/Channel.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/FileType.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/FileType.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/FileType.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/FileType.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/LinkStructure.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/LinkStructure.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/LinkStructure.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/LinkStructure.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/MonitorScheduler.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/MonitorScheduler.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/Recording.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/Recording.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java

diff --git a/mythtv/war/src/main/java/org/wamblee/mythtv/RecordingDatabase.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
similarity index 100%
rename from mythtv/war/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
rename to mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java

diff --git a/mythtv/pom.xml b/mythtv/pom.xml
index 40d40371acb0c98ec3969adff7691fbda32da172..8765147d7bcb21c10cecbcd9a94c1a6cab66fe06 100644 (file)
--- a/mythtv/pom.xml
+++ b/mythtv/pom.xml
@@ -16,6 +16,7 @@
   <url>http://wamblee.org</url>
   
   <modules>
+    <module>monitor</module>
     <module>war</module>
     <module>ear</module>
   </modules>

diff --git a/mythtv/war/pom.xml b/mythtv/war/pom.xml
index 1891c3a985531c7168d1173e477e350b923f9a85..30c9c477619da42dd7b792370ec786861ca7abac 100644 (file)
--- a/mythtv/war/pom.xml
+++ b/mythtv/war/pom.xml
@@ -18,20 +18,8 @@
   <dependencies>
     <dependency>
         <groupId>org.wamblee</groupId>
-        <artifactId>wamblee-support</artifactId>
-    </dependency>
-       <dependency>
-         <groupId>quartz</groupId>
-         <artifactId>quartz</artifactId>
-       </dependency>
-       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-       </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
+        <artifactId>wamblee-mythtv-monitor</artifactId>
+        <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -44,6 +32,13 @@
                <webXml>${basedir}/src/webapp/WEB-INF/web.xml</webXml>
                <warName>wamblee-mythtv</warName>
                <warSourceDirectory>src/webapp</warSourceDirectory>
+                <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                <archive>
+                  <manifest>
+                    <addClasspath>true</addClasspath>
+                    <classpathPrefix>lib</classpathPrefix>
+                  </manifest>
+                </archive>
           </configuration>
        </plugin>
     </plugins>