(no commit message)

diff --git a/mythtv/pom.xml b/mythtv/pom.xml
index ce6233f842f8566c1c50fb7a95ac1c50b8abd6de..49135f4f0126ab27edbab74a8856bd6b2c4717d3 100644 (file)
--- a/mythtv/pom.xml
+++ b/mythtv/pom.xml
@@ -11,28 +11,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.wamblee</groupId>
   <artifactId>wamblee-mythtv</artifactId>
-  <packaging>war</packaging>
-  <name>wamblee.org mythtv directory monitor</name>
+  <packaging>pom</packaging>
+  <name>wamblee.org mythtv directory monitor WAR</name>
   <url>http://wamblee.org</url>
   
+  <modules>
+    <module>war</module>
+  </modules>
+  
   <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>
-    </dependency>
   </dependencies>
 
   <build>

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

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

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

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

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

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

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

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

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

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

diff --git a/mythtv/src/main/resources/Channel.hbm.xml b/mythtv/war/src/main/resources/Channel.hbm.xml
similarity index 100%
rename from mythtv/src/main/resources/Channel.hbm.xml
rename to mythtv/war/src/main/resources/Channel.hbm.xml

diff --git a/mythtv/src/main/resources/Recording.hbm.xml b/mythtv/war/src/main/resources/Recording.hbm.xml
similarity index 100%
rename from mythtv/src/main/resources/Recording.hbm.xml
rename to mythtv/war/src/main/resources/Recording.hbm.xml

diff --git a/mythtv/src/main/resources/beanRefContext.xml b/mythtv/war/src/main/resources/beanRefContext.xml
similarity index 100%
rename from mythtv/src/main/resources/beanRefContext.xml
rename to mythtv/war/src/main/resources/beanRefContext.xml

diff --git a/mythtv/src/main/resources/org.wamblee.beanfactory.properties b/mythtv/war/src/main/resources/org.wamblee.beanfactory.properties
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.beanfactory.properties
rename to mythtv/war/src/main/resources/org.wamblee.beanfactory.properties

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.application.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.application.xml
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.datasource.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.datasource.xml
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.datasource.xml
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.datasource.xml

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.hibernate.properties b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.properties
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.hibernate.properties
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.properties

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.hibernate.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.hibernate.xml
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.hibernatemappings.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernatemappings.xml
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.hibernatemappings.xml
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.hibernatemappings.xml

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

diff --git a/mythtv/src/main/resources/org.wamblee.mythtv.properties.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.properties.xml
similarity index 100%
rename from mythtv/src/main/resources/org.wamblee.mythtv.properties.xml
rename to mythtv/war/src/main/resources/org.wamblee.mythtv.properties.xml

diff --git a/mythtv/src/test/resources/org.wamblee.mythtv.datasource.standalone.xml b/mythtv/war/src/test/resources/org.wamblee.mythtv.datasource.standalone.xml
similarity index 100%
rename from mythtv/src/test/resources/org.wamblee.mythtv.datasource.standalone.xml
rename to mythtv/war/src/test/resources/org.wamblee.mythtv.datasource.standalone.xml

diff --git a/mythtv/src/webapp/META-INF/MANIFEST.MF b/mythtv/war/src/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from mythtv/src/webapp/META-INF/MANIFEST.MF
rename to mythtv/war/src/webapp/META-INF/MANIFEST.MF

diff --git a/mythtv/src/webapp/WEB-INF/web.xml b/mythtv/war/src/webapp/WEB-INF/web.xml
similarity index 100%
rename from mythtv/src/webapp/WEB-INF/web.xml
rename to mythtv/war/src/webapp/WEB-INF/web.xml