[jsword-svn] r1985 - in trunk: . bibledesktop bibledesktop-web common common-aqua common-swing jsword

dmsmith at crosswire.org dmsmith at crosswire.org
Sun Feb 21 12:32:21 MST 2010


Author: dmsmith
Date: 2010-02-21 12:32:21 -0700 (Sun, 21 Feb 2010)
New Revision: 1985

Added:
   trunk/bibledesktop-web/pom.xml
   trunk/bibledesktop/pom.xml
   trunk/common-aqua/pom.xml
   trunk/common-swing/pom.xml
   trunk/common/pom.xml
   trunk/jsword/pom.xml
   trunk/pom.xml
Log:
Mavenize the projects. POMs from Trenton Adams.

Added: trunk/bibledesktop/pom.xml
===================================================================
--- trunk/bibledesktop/pom.xml	                        (rev 0)
+++ trunk/bibledesktop/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,120 @@
+<?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>
+    <groupId>org.crosswire</groupId>
+    <artifactId>jsword-base</artifactId>
+    <version>1.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>bibledesktop</artifactId>
+  <packaging>jar</packaging>
+  <version>${parent.version}</version>
+  <name>bibledesktop</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>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jsword-common</artifactId>
+      <version>${parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jsword-common-swing</artifactId>
+      <version>${parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jsword</artifactId>
+      <version>${parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jlfgr</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+  <profiles>
+    <profile>
+      <id>run</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <mainClass>org.crosswire.bibledesktop.desktop.Desktop</mainClass>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>common-aqua</id>
+      <activation>
+        <property>
+          <name>os.name</name>
+          <value>Mac OS X</value> <!-- fix this to mac os-->
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.crosswire</groupId>
+          <artifactId>common-aqua</artifactId>
+          <version>${parent.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
+

Added: trunk/bibledesktop-web/pom.xml
===================================================================
--- trunk/bibledesktop-web/pom.xml	                        (rev 0)
+++ trunk/bibledesktop-web/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,117 @@
+<?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>bibldesktop-web</artifactId>
+  <packaging>war</packaging>
+  <version>${parent.version}</version>
+  <name>bibledesktop-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>
+  </dependencies>
+  <properties>
+    <context.path>${project.artifactId}</context.path>
+  </properties>
+  <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>
+          <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>
+            <plugin>
+                <groupId>org.glassfish.maven.plugin</groupId>
+                <artifactId>maven-glassfish-plugin</artifactId>
+                <version>2.1</version>
+            </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/common/pom.xml
===================================================================
--- trunk/common/pom.xml	                        (rev 0)
+++ trunk/common/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,62 @@
+<?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>
+    <groupId>org.crosswire</groupId>
+    <artifactId>jsword-base</artifactId>
+    <version>1.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>jsword-common</artifactId>
+  <packaging>jar</packaging>
+  <version>${parent.version}</version>
+  <name>jsword-common</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>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </testResource>
+    </testResources>
+
+  </build>
+</project>

Added: trunk/common-aqua/pom.xml
===================================================================
--- trunk/common-aqua/pom.xml	                        (rev 0)
+++ trunk/common-aqua/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,62 @@
+<?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>
+    <groupId>org.crosswire</groupId>
+    <artifactId>jsword-base</artifactId>
+    <version>1.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>common-aqua</artifactId>
+  <packaging>jar</packaging>
+  <version>${parent.version}</version>
+  <name>common-aqua</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>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </testResource>
+    </testResources>
+
+  </build>
+</project>

Added: trunk/common-swing/pom.xml
===================================================================
--- trunk/common-swing/pom.xml	                        (rev 0)
+++ trunk/common-swing/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,54 @@
+<?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>
+    <groupId>org.crosswire</groupId>
+    <artifactId>jsword-base</artifactId>
+    <version>1.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>jsword-common-swing</artifactId>
+  <packaging>jar</packaging>
+  <version>${parent.version}</version>
+  <name>jsword-common-swing</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>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jsword-common</artifactId>
+      <version>${parent.version}</version>
+    </dependency>
+  </dependencies>
+  <build>    
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+    </resources>
+
+  </build>
+</project>
+

Added: trunk/jsword/pom.xml
===================================================================
--- trunk/jsword/pom.xml	                        (rev 0)
+++ trunk/jsword/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,73 @@
+<?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>
+    <groupId>org.crosswire</groupId>
+    <artifactId>jsword-base</artifactId>
+    <version>1.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>jsword</artifactId>
+  <packaging>jar</packaging>
+  <version>${parent.version}</version>
+  <name>jsword</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>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.crosswire</groupId>
+      <artifactId>jsword-common</artifactId>
+      <version>${parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-snowball</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-smartcn</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.plugin</include>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
+          <include>**/*.txt</include>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
+

Added: trunk/pom.xml
===================================================================
--- trunk/pom.xml	                        (rev 0)
+++ trunk/pom.xml	2010-02-21 19:32:21 UTC (rev 1985)
@@ -0,0 +1,119 @@
+<?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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.crosswire</groupId>
+  <artifactId>jsword-base</artifactId>
+  <packaging>pom</packaging>
+  <version>1.6.1-SNAPSHOT</version>
+  <name>jsword-base</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+    <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
+
+    <project.reporting.outputEncoding>iso-8859-1</project.reporting.outputEncoding>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javatar</groupId>
+      <artifactId>javatar</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <encoding>iso-8859-1</encoding>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <distributionManagement>
+    <repository>
+      <id>crosswire-repo</id>
+      <name>Cross Wire Maven Repository</name>
+      <url>scp://maven.crosswire.org/var/www/maven.crosswire.org/htdocs/
+      </url>
+    </repository>
+  </distributionManagement>
+
+
+  <modules>
+    <module>common</module>
+    <module>common-swing</module>
+    <module>jsword</module>
+    <module>bibledesktop</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>test</id>
+      <properties>
+        <maven.test.skip>false</maven.test.skip>
+      </properties>
+    </profile>
+    <profile>
+      <id>common-aqua</id>
+      <activation>
+        <property>
+          <name>os.name</name>
+          <value>Mac OS X</value> <!-- fix this to mac os-->
+        </property>
+      </activation>
+      <modules>
+        <module>common-aqua</module>
+      </modules>
+    </profile>
+  </profiles>
+
+</project>
+




More information about the jsword-svn mailing list