[jsword-svn] r1988 - in trunk: bibledesktop bibledesktop-web bibledesktop-web/src/main common-aqua jsword-web jsword-web/src/main
dmsmith at crosswire.org
dmsmith at crosswire.org
Mon Apr 19 16:39:21 MST 2010
Author: dmsmith
Date: 2010-04-19 16:39:21 -0700 (Mon, 19 Apr 2010)
New Revision: 1988
Added:
trunk/bibledesktop-web/src/main/context.xml
trunk/jsword-web/pom.xml
trunk/jsword-web/src/main/context.xml
Modified:
trunk/bibledesktop-web/pom.xml
trunk/bibledesktop/pom.xml
trunk/common-aqua/pom.xml
Log:
Updated w/ Trenton Adams' Maven POM support.
Modified: trunk/bibledesktop/pom.xml
===================================================================
--- trunk/bibledesktop/pom.xml 2010-02-21 22:32:08 UTC (rev 1987)
+++ trunk/bibledesktop/pom.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -43,9 +43,11 @@
<version>${parent.version}</version>
</dependency>
<dependency>
- <groupId>org.crosswire</groupId>
+ <groupId>com.sun</groupId>
<artifactId>jlfgr</artifactId>
<version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/jar/jlfgr-1.0/jlfgr-1_0.jar</systemPath>
</dependency>
</dependencies>
<profiles>
@@ -76,7 +78,7 @@
<activation>
<property>
<name>os.name</name>
- <value>Mac OS X</value> <!-- fix this to mac os-->
+ <value>Mac OS X</value>
</property>
</activation>
<dependencies>
Modified: trunk/bibledesktop-web/pom.xml
===================================================================
--- trunk/bibledesktop-web/pom.xml 2010-02-21 22:32:08 UTC (rev 1987)
+++ trunk/bibledesktop-web/pom.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.crosswire.cv_accounting</groupId>
- <artifactId>bibldesktop-web</artifactId>
+ <artifactId>bibledesktop-web</artifactId>
<packaging>war</packaging>
<version>${parent.version}</version>
<name>bibledesktop-web</name>
@@ -27,14 +27,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<configuration>
@@ -44,12 +36,6 @@
<path>${context.path}</path>
</configuration>
</plugin>
- <plugin>
- <groupId>org.glassfish.maven.plugin</groupId>
- <artifactId>maven-glassfish-plugin</artifactId>
- <version>2.1</version>
- </plugin>
-
</plugins>
</build>
Added: trunk/bibledesktop-web/src/main/context.xml
===================================================================
--- trunk/bibledesktop-web/src/main/context.xml (rev 0)
+++ trunk/bibledesktop-web/src/main/context.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context docBase="${project.build.directory}/${pom.build.finalName}/"
+ antiResourceLocking="false" privileged="false" reloadable="true"/>
Modified: trunk/common-aqua/pom.xml
===================================================================
--- trunk/common-aqua/pom.xml 2010-02-21 22:32:08 UTC (rev 1987)
+++ trunk/common-aqua/pom.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -9,10 +9,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.crosswire</groupId>
- <artifactId>common-aqua</artifactId>
+ <artifactId>jsword-common-aqua</artifactId>
<packaging>jar</packaging>
<version>${parent.version}</version>
- <name>common-aqua</name>
+ <name>jsword-common-aqua</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
@@ -31,6 +31,7 @@
<groupId>org.crosswire</groupId>
<artifactId>jsword-common-swing</artifactId>
<version>${parent.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
Added: trunk/jsword-web/pom.xml
===================================================================
--- trunk/jsword-web/pom.xml (rev 0)
+++ trunk/jsword-web/pom.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <artifactId>jsword-base</artifactId>
+ <groupId>org.crosswire</groupId>
+ <version>1.6.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.crosswire.cv_accounting</groupId>
+ <artifactId>jsword-web</artifactId>
+ <packaging>war</packaging>
+ <version>${parent.version}</version>
+ <name>jsword-web</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-common</artifactId>
+ <version>${parent.version}</version>
+ </dependency>
+
+ </dependencies>
+ <properties>
+ <context.path>${project.artifactId}</context.path>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <server>${tomcat.server}</server>
+ <url>${tomcat.manager.url}</url>
+ <!-- Set this context path property in the profile you're using -->
+ <path>${context.path}</path>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- This profile sets up a context.xml to point to your target/finalName
+ folder. So,
+ when you call tomcat:deploy, you end up deploying the context.xml
+ instead of the whole WAR. You should only need to do this once. This
+ speeds up the performance of development deployments because now we only
+ have to compile our code, not deploy an entire WAR to tomcat.
+
+ Please note that any time you do a clean, you will need to do a tomcat:deploy
+ again. But, you do not need to do a tomcat:undeploy, because tomcat (v6)
+ automatically removes the context when you remove the context directory.
+
+ I personally (Trent) put tomcat in my own group (trenta) so that it
+ has access to my stuff. That way, it has full access to read my
+ target directory.
+
+ Example:
+ mvn -Plocal package tomcat:deploy
+ OR
+ mvn -Plocal package tomcat:deploy
+
+ subsequent builds...
+ mvn -Plocal package
+ OR
+ mvn -Plocal package
+ -->
+ <id>local</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <mode>context</mode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-1</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/</directory>
+ <!-- override the destination directory for this resource -->
+ <targetPath>META-INF</targetPath>
+ <!-- enable filtering -->
+ <filtering>true</filtering>
+ <includes>
+ <include>context.xml</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
Added: trunk/jsword-web/src/main/context.xml
===================================================================
--- trunk/jsword-web/src/main/context.xml (rev 0)
+++ trunk/jsword-web/src/main/context.xml 2010-04-19 23:39:21 UTC (rev 1988)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context docBase="${project.build.directory}/${pom.build.finalName}/"
+ antiResourceLocking="false" privileged="false" reloadable="true"/>
More information about the jsword-svn
mailing list