forked from igniterealtime/Openfire
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate build process from Ant to Maven (WIP).
The Maven structure is: -/ --dbutil (used by xmppserver) --i18n (used by starter and xmppserver) --starter (launcher and starter package, startup.jar) --xmppserver (nearly everything in the src dir, openfire.jar) --webadmin (admin plugin) --plugins ---broadcast ---... I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...) This commit addresses issues OF-546. I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched. What it can do: - Run tests successfully - Generate JavaDoc - Assemble most plugin jars (without JSP) - Assemble admin plugin (without JSP) - Generate a source zip/tar.gz for distribution (as the download page offers it currently) - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar` What it can't do: - Build executables for every platform (e.g. install4j, *.dmg, ...) - Compile JSP pages (waiting for PR igniterealtime#305) - Build some plugins (e.g. ofmeet) due to non-Maven dependencies. Todos: - Fix these issues - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
- Loading branch information
Showing
47 changed files
with
2,303 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>parent</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<artifactId>dbutil</artifactId> | ||
<name>Database Utilities</name> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>parent</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
<relativePath>..</relativePath> | ||
</parent> | ||
<artifactId>i18n</artifactId> | ||
<name>Internationalization files for Openfire</name> | ||
<description>These files are shared among the starter and xmppserver modules</description> | ||
<build> | ||
<resources> | ||
<resource> | ||
<directory>../src/i18n</directory> | ||
</resource> | ||
</resources> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>broadcast</artifactId> | ||
<name>Broadcast Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/broadcast/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>callbackOnOffline</artifactId> | ||
<name>ClientControl Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/callbackOnOffline/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.glassfish.jersey.core</groupId> | ||
<artifactId>jersey-client</artifactId> | ||
<version>2.21</version> | ||
</dependency> | ||
</dependencies> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>clientControl</artifactId> | ||
<name>ClientControl Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/clientControl/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.eclipse.jetty</groupId> | ||
<artifactId>jetty-jspc-maven-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>clustering</artifactId> | ||
<name>Clustering Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/clustering/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>contentFilter</artifactId> | ||
<name>ContentFilter Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/contentFilter/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>dbaccess</artifactId> | ||
<name>DB Access Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/dbaccess/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>emailListener</artifactId> | ||
<name>Email Listener Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/emailListener/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>emailOnAway</artifactId> | ||
<name>Email On Away Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/emailOnAway/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>fastpath</artifactId> | ||
<name>Fastpath Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/fastpath/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.thoughtworks.xstream</groupId> | ||
<artifactId>xstream</artifactId> | ||
<version>1.4.6</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.apache.lucene</groupId> | ||
<artifactId>lucene-core</artifactId> | ||
<version>2.0.0</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>gojara</artifactId> | ||
<name>Gojara Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/gojara/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.json</groupId> | ||
<artifactId>json</artifactId> | ||
<version>20090211</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>hazelcast</artifactId> | ||
<name>Hazelcast Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/hazelcast/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.hazelcast</groupId> | ||
<artifactId>hazelcast</artifactId> | ||
<version>3.5.1</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>jingleNodes</artifactId> | ||
<name>JingleNodes Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/jingleNodes/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.xmpp</groupId> | ||
<artifactId>jnsapi</artifactId> | ||
<version>0.0.1</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<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/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>plugins</artifactId> | ||
<groupId>org.igniterealtime.openfire</groupId> | ||
<version>4.0.0-SNAPSHOT</version> | ||
</parent> | ||
<groupId>org.igniterealtime.openfire.plugins</groupId> | ||
<artifactId>jmxweb</artifactId> | ||
<name>JMXWeb Plugin</name> | ||
|
||
<build> | ||
<sourceDirectory>../../src/plugins/jmxweb/src/java</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
</project> |
Oops, something went wrong.