git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7eb3e2
)
(no commit message)
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Mon, 4 Feb 2008 21:37:55 +0000
(21:37 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Mon, 4 Feb 2008 21:37:55 +0000
(21:37 +0000)
14 files changed:
trunk/mythtv/ear/pom.xml
patch
|
blob
|
history
trunk/mythtv/monitor/pom.xml
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Application.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Channel.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Channel.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/FileType.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/FileType.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/LinkStructure.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/LinkStructure.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Recording.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
[moved from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
with 100% similarity]
patch
|
blob
|
history
trunk/mythtv/pom.xml
patch
|
blob
|
history
trunk/mythtv/war/pom.xml
patch
|
blob
|
history
diff --git
a/trunk/mythtv/ear/pom.xml
b/trunk/mythtv/ear/pom.xml
index c7b7cc9baf3e5612c787860f003bbfb85d909042..da812ad3ff3710a955d9c7f53ff0e67afb616633 100644
(file)
--- a/
trunk/mythtv/ear/pom.xml
+++ b/
trunk/mythtv/ear/pom.xml
@@
-22,6
+22,22
@@
<version>${project.version}</version>
<type>war</type>
</dependency>
<version>${project.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-mythtv-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <defaultJavaBundleDir>lib/</defaultJavaBundleDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
</project>
diff --git
a/trunk/mythtv/monitor/pom.xml
b/trunk/mythtv/monitor/pom.xml
index 72602923f587be0547498b0787a632f94bad9854..658d67240a9fec7f220184ad1ac01944f0d7c7c1 100644
(file)
--- a/
trunk/mythtv/monitor/pom.xml
+++ b/
trunk/mythtv/monitor/pom.xml
@@
-11,7
+11,7
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-mythtv-monitor</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-mythtv-monitor</artifactId>
- <packaging>
w
ar</packaging>
+ <packaging>
j
ar</packaging>
<name>wamblee.org mythtv directory monitor MONITOR</name>
<url>http://wamblee.org</url>
<name>wamblee.org mythtv directory monitor MONITOR</name>
<url>http://wamblee.org</url>
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Application.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Application.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Channel.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Channel.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Channel.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Channel.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/FileType.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/FileType.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/FileType.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/FileType.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/LinkStructure.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/LinkStructure.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/LinkStructure.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/LinkStructure.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MonitorScheduler.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvHibernateMappings.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/PollDirectoryJob.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Recording.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/Recording.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
diff --git
a/trunk/mythtv/war/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
similarity index 100%
rename from
trunk/mythtv/war/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
rename to
trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
diff --git
a/trunk/mythtv/pom.xml
b/trunk/mythtv/pom.xml
index 40d40371acb0c98ec3969adff7691fbda32da172..8765147d7bcb21c10cecbcd9a94c1a6cab66fe06 100644
(file)
--- a/
trunk/mythtv/pom.xml
+++ b/
trunk/mythtv/pom.xml
@@
-16,6
+16,7
@@
<url>http://wamblee.org</url>
<modules>
<url>http://wamblee.org</url>
<modules>
+ <module>monitor</module>
<module>war</module>
<module>ear</module>
</modules>
<module>war</module>
<module>ear</module>
</modules>
diff --git
a/trunk/mythtv/war/pom.xml
b/trunk/mythtv/war/pom.xml
index 1891c3a985531c7168d1173e477e350b923f9a85..30c9c477619da42dd7b792370ec786861ca7abac 100644
(file)
--- a/
trunk/mythtv/war/pom.xml
+++ b/
trunk/mythtv/war/pom.xml
@@
-18,20
+18,8
@@
<dependencies>
<dependency>
<groupId>org.wamblee</groupId>
<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>
</dependency>
</dependencies>
@@
-44,6
+32,13
@@
<webXml>${basedir}/src/webapp/WEB-INF/web.xml</webXml>
<warName>wamblee-mythtv</warName>
<warSourceDirectory>src/webapp</warSourceDirectory>
<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>
</configuration>
</plugin>
</plugins>