Skip to content

O
Openfire
Commit 79ae79bf authored by Guus der Kinderen's avatar Guus der Kinderen Committed by daryl herzmann
Browse files
Options

OF-546: Move Maven POM files into source directory. 

I continue to be thoroughly confused by having two directories per plugin, one for the plugin sources, and one for the maven build. This commit merges both directories.

As a side effect, various plugin unit tests are now executed by default. Some failed, for which I applied fixes.

This commit also adds some plugins to the Maven structure that previously were not.
parent 0d0987d1
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 407 deletions
plugins/contentFilter/pom.xml deleted 100644 → 0
View file @ 0d0987d1
<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.2.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>
\ No newline at end of file
pom.xml
View file @ 79ae79bf
......@@ -13,7 +13,7 @@
<module>i18n</module>
<module>xmppserver</module>
<module>starter</module>
<module>plugins</module>
<module>src/plugins</module>
<module>webadmin</module>
<module>webadmintld</module>
</modules>
......
src/plugins/avatarResizer/pom.xml 0 → 100644
View file @ 79ae79bf
<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.2.0-SNAPSHOT</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>avatarresizer</artifactId>
<name>Avatar Resizer Plugin</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
src/plugins/avatarResizer/src/java/org/igniterealtime/openfire/plugin/avatarresizer/Resizer.java
View file @ 79ae79bf
......@@ -85,7 +85,7 @@ public class Resizer
if ( avatar.getWidth() <= targetDimension && avatar.getHeight() <= targetDimension )
{
Log.debug( "Original image dimension ({}x{}) is within acceptable bounds ({}x{}). No need to resize.", avatar.getWidth(), avatar.getHeight(), targetDimension, targetDimension );
Log.debug( "Original image dimension ({}x{}) is within acceptable bounds ({}x{}). No need to resize.", new Object[] { avatar.getWidth(), avatar.getHeight(), targetDimension, targetDimension });
return null;
}
}
......
src/plugins/bookmarks/pom.xml 0 → 100644
View file @ 79ae79bf
<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.2.0-SNAPSHOT</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>bookmarks</artifactId>
<name>Bookmarks Plugin</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
plugins/broadcast/pom.xml → src/plugins/broadcast/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Broadcast Plugin</name>
<build>
<sourceDirectory>../../src/plugins/broadcast/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/callbackOnOffline/pom.xml → src/plugins/callbackOnOffline/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Callback on Offline Plugin</name>
<build>
<sourceDirectory>../../src/plugins/callbackOnOffline/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
src/plugins/callbackOnOffline/src/java/com/fotsum/CallbackOnOffline.java
View file @ 79ae79bf
......@@ -98,7 +98,7 @@ public class CallbackOnOffline implements Plugin, PacketInterceptor {
boolean available = presenceManager.isAvailable(userTo);
if (debug) {
Log.debug("intercepted message from {} to {}, recipient is available {}", packet.getFrom().toBareJID(), to.toBareJID(), available);
Log.debug("intercepted message from {} to {}, recipient is available {}", new Object[] { packet.getFrom().toBareJID(), to.toBareJID(), available });
}
if (!available) {
......
plugins/clientControl/pom.xml → src/plugins/clientControl/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>ClientControl Plugin</name>
<build>
<sourceDirectory>../../src/plugins/clientControl/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/clustering/pom.xml → src/plugins/clustering/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Clustering Plugin</name>
<build>
<sourceDirectory>../../src/plugins/clustering/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
src/plugins/contentFilter/pom.xml 0 → 100644
View file @ 79ae79bf
<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.2.0-SNAPSHOT</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>contentFilter</artifactId>
<name>ContentFilter Plugin</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pull-parser</groupId>
<artifactId>pull-parser</artifactId>
<version>2.1.10</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
src/plugins/contentFilter/src/test/java/org/jivesoftware/openfire/plugin/ContentFilterTest.java
View file @ 79ae79bf
......@@ -3,11 +3,10 @@ package org.jivesoftware.openfire.plugin;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.io.XPPReader;
import org.jdom.filter.ContentFilter;
import org.gjt.xpp.XmlPullParserException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.xmlpull.v1.XmlPullParserException;
import org.xmpp.packet.Message;
import org.xmpp.packet.Presence;
......@@ -25,18 +24,14 @@ import static org.junit.Assert.*;
public class ContentFilterTest {
private ContentFilter filter;
public static void main(String[] args) {
junit.textui.TestRunner.run(ContentFilterTest.class);
}
@Before
protected void setUp() throws Exception {
public void setUp() throws Exception {
filter = new ContentFilter();
}
@After
protected void tearDown() throws Exception {
public void tearDown() throws Exception {
filter.clearMask();
filter.clearPatterns();
filter = null;
......
plugins/dbaccess/pom.xml → src/plugins/dbaccess/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>DB Access Plugin</name>
<build>
<sourceDirectory>../../src/plugins/dbaccess/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/emailListener/pom.xml → src/plugins/emailListener/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Email Listener Plugin</name>
<build>
<sourceDirectory>../../src/plugins/emailListener/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/emailOnAway/pom.xml → src/plugins/emailOnAway/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Email On Away Plugin</name>
<build>
<sourceDirectory>../../src/plugins/emailOnAway/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/fastpath/pom.xml → src/plugins/fastpath/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Fastpath Plugin</name>
<build>
<sourceDirectory>../../src/plugins/fastpath/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/gojara/pom.xml → src/plugins/gojara/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Gojara Plugin</name>
<build>
<sourceDirectory>../../src/plugins/gojara/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/hazelcast/pom.xml → src/plugins/hazelcast/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Hazelcast Plugin</name>
<build>
<sourceDirectory>../../src/plugins/hazelcast/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/jingleNodes/pom.xml → src/plugins/jingleNodes/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>JingleNodes Plugin</name>
<build>
<sourceDirectory>../../src/plugins/jingleNodes/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/jmxweb/pom.xml → src/plugins/jmxweb/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>JMXWeb Plugin</name>
<build>
<sourceDirectory>../../src/plugins/jmxweb/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/justmarried/pom.xml → src/plugins/justmarried/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>JustMarried Plugin</name>
<build>
<sourceDirectory>../../src/plugins/justmarried/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
src/plugins/kraken/kraken.iml deleted 100644 → 0
View file @ 0d0987d1
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/.settings" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="ant-contrib.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/build/lib/ant-contrib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="ant-jive-edition.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/build/lib/ant-jive-edition.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="qdox.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/build/lib/qdox.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="concurrent.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/concurrent.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="dwr.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/dwr.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jainsipapi.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jainsipapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jainsipri.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jainsipri.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jakarta-regexp.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jakarta-regexp.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jggapi.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jggapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jml.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="joscar-common.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/joscar-common.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="joscar-protocol.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/joscar-protocol.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jsocks.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jsocks.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="log4j.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/log4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="martyr.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/martyr.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="smack.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/smack.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="smackx.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/smackx.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="xmlrpc.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/xmlrpc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="servlet-api.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/dist/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jqql.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jqql.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jdom.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/merge/jdom.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="dom4j.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/dom4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="stcomm.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/stcomm.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="msim.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/msim.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="httpcore.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/httpcore.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="json.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/json.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="httpclient.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/httpclient.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="openymsg.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/openymsg.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="openfire" />
<orderEntry type="module-library">
<library name="jfacebookiml.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jfacebookiml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/merge/jsp-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/merge/jstl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/build/lib/merge/standard.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="classes">
<CLASSES>
<root url="file://$MODULE_DIR$/../openfire/work/classes" />
<root url="file://$MODULE_DIR$/../openfire/work/classes" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/../openfire/work/classes" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../openfire/target/openfire/lib/openfire.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
plugins/kraken/pom.xml → src/plugins/kraken/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Kraken Plugin</name>
<build>
<sourceDirectory>../../src/plugins/kraken/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/loadStats/pom.xml → src/plugins/loadStats/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>LoadStats Plugin</name>
<build>
<sourceDirectory>../../src/plugins/loadStats/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/monitoring/pom.xml → src/plugins/monitoring/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Monitoring Plugin</name>
<build>
<sourceDirectory>../../src/plugins/monitoring/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/motd/pom.xml → src/plugins/motd/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Message of the Day Plugin</name>
<build>
<sourceDirectory>../../src/plugins/motd/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/mucservice/pom.xml → src/plugins/mucservice/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>MUC Service Plugin</name>
<build>
<sourceDirectory>../../src/plugins/mucservice/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/nodejs/pom.xml → src/plugins/nodejs/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>NodeJS Plugin</name>
<build>
<sourceDirectory>../../src/plugins/nodejs/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
src/plugins/nonSaslAuthentication/pom.xml 0 → 100644
View file @ 79ae79bf
<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.2.0-SNAPSHOT</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>nonsaslauthentication</artifactId>
<name>non-SASL Authentication Plugin</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
plugins/packetFilter/pom.xml → src/plugins/packetFilter/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>PacketFilter Plugin</name>
<build>
<sourceDirectory>../../src/plugins/packetFilter/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/pom.xml → src/plugins/pom.xml
View file @ 79ae79bf
......@@ -9,6 +9,8 @@
<modules>
<module>openfire-plugin-assembly-descriptor</module>
<module>avatarResizer</module>
<module>bookmarks</module>
<module>broadcast</module>
<module>callbackOnOffline</module>
<module>clientControl</module>
......@@ -31,6 +33,7 @@
<module>motd</module>
<module>mucservice</module>
<module>nodejs</module>
<module>nonSaslAuthentication</module>
<module>packetFilter</module>
<!--<module>rayo</module>-->
<module>presence</module>
......@@ -41,6 +44,7 @@
<!--<module>sip</module>-->
<module>stunserver</module>
<module>subscription</module>
<module>tikitoken</module>
<module>userCreation</module>
<module>userImportExport</module>
<module>userservice</module>
......
plugins/presence/pom.xml → src/plugins/presence/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Presence Plugin</name>
<build>
<sourceDirectory>../../src/plugins/presence/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/rayo/pom.xml → src/plugins/rayo/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Rayo Plugin</name>
<build>
<sourceDirectory>../../src/plugins/rayo/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/registration/pom.xml → src/plugins/registration/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Registration Plugin</name>
<build>
<sourceDirectory>../../src/plugins/registration/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/restAPI/pom.xml → src/plugins/restAPI/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Rest API Plugin</name>
<build>
<sourceDirectory>../../src/plugins/restAPI/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/search/pom.xml → src/plugins/search/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Search Plugin</name>
<build>
<sourceDirectory>../../src/plugins/search/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/sip/pom.xml → src/plugins/sip/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>SIP Plugin</name>
<build>
<sourceDirectory>../../src/plugins/sip/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/stunserver/pom.xml → src/plugins/stunserver/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>STUN Server Plugin</name>
<build>
<sourceDirectory>../../src/plugins/stunserver/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/subscription/pom.xml → src/plugins/subscription/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>Subscription Plugin</name>
<build>
<sourceDirectory>../../src/plugins/subscription/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
src/plugins/tikitoken/pom.xml 0 → 100644
View file @ 79ae79bf
<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.2.0-SNAPSHOT</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>tikitoken</artifactId>
<name>TikiToken Plugin</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.owlike</groupId>
<artifactId>genson</artifactId>
<version>1.4</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
plugins/userCreation/pom.xml → src/plugins/userCreation/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>UserCreation Plugin</name>
<build>
<sourceDirectory>../../src/plugins/userCreation/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/userImportExport/pom.xml → src/plugins/userImportExport/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>UserImportExport Plugin</name>
<build>
<sourceDirectory>../../src/plugins/userImportExport/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......@@ -45,6 +45,12 @@
<artifactId>commons-fileupload</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/OpenfireExporterTest.java
View file @ 79ae79bf
/*
package org.jivesoftware.openfire.plugin;/*
* Copyright 2016 Anno van Vliet
*
* Licensed under the Apache License, Version 2.0 (the "License");
......@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.openfire.plugin;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
......@@ -72,7 +71,7 @@ public class OpenfireExporterTest {
@Before
public void setUp() throws Exception {
URL url = this.getClass().getResource("test-openfire.xml");
URL url = this.getClass().getResource("/test-openfire.xml");
File f = new File(url.getFile());
JiveGlobals.setConfigName(f.getName());
JiveGlobals.setHomeDirectory(f.getParent());
......@@ -92,7 +91,7 @@ public class OpenfireExporterTest {
@Test
public void testExportUsers() throws UserAlreadyExistsException, IOException {
InExporter testobject = new OpenfireExporter("serverName",userManager,rosterItemProvider);
InExporter testobject = new OpenfireExporter( "serverName", userManager, rosterItemProvider);
for (int i = 0; i < 10; i++) {
userManager.createUser("username" + i,"pw" , "name" + i, "email" + i);
......@@ -132,7 +131,7 @@ public class OpenfireExporterTest {
InExporter testobject = new OpenfireExporter("serverName",userManager,rosterItemProvider);
String TEST_IMPORT_FILE = "test-openfire-import.xml";
String TEST_IMPORT_FILE = "/test-openfire-import.xml";
InputStream stream = this.getClass().getResourceAsStream(TEST_IMPORT_FILE);
......
src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/Xep227ExporterTest.java
View file @ 79ae79bf
......@@ -133,7 +133,7 @@ public class Xep227ExporterTest {
@Before
public void setUp() throws Exception {
URL url = this.getClass().getResource("test-openfire.xml");
URL url = this.getClass().getResource("/test-openfire.xml");
File f = new File(url.getFile());
JiveGlobals.setConfigName(f.getName());
JiveGlobals.setHomeDirectory(f.getParent());
......@@ -206,7 +206,7 @@ public class Xep227ExporterTest {
InExporter testobject = new Xep227Exporter("serverName", offlineMessagesStore, vCardManager, privateStorage, userManager, rosterItemProvider);
InputStream stream = this.getClass().getResourceAsStream("test-xepp227-import.xml");
InputStream stream = this.getClass().getResourceAsStream("/test-xepp227-import.xml");
assertTrue("Invalid input", testobject.validate(stream));
......@@ -226,7 +226,7 @@ public class Xep227ExporterTest {
InExporter testobject = new Xep227Exporter("serverName", offlineMessagesStore, vCardManager, privateStorage, userManager, rosterItemProvider);
InputStream stream = this.getClass().getResourceAsStream("test-xepp227-import.xml");
InputStream stream = this.getClass().getResourceAsStream("/test-xepp227-import.xml");
String previousDomain = null;
boolean isUserProviderReadOnly = false;
......
src/plugins/userImportExport/src/test/java/test-export-xinclude/xep227.xml → src/plugins/userImportExport/src/test/resources/test-export-xinclude/xep227.xml
View file @ 79ae79bf
<?xml version='1.0' encoding='UTF-8'?>
<server-data xmlns='urn:xmpp:pie:0' xmlns:xi='http://www.w3.org/2001/XInclude'>
<xi:include href='src/plugins/userImportExport/src/test/java/test-export-xinclude/test-import.xml' />
<xi:include href='src/test/resources/test-export-xinclude/test-import.xml' />
</server-data>
\ No newline at end of file
plugins/userservice/pom.xml → src/plugins/userservice/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>UserService Plugin</name>
<build>
<sourceDirectory>../../src/plugins/userservice/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/websocket/pom.xml → src/plugins/websocket/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>WebSocket Plugin</name>
<build>
<sourceDirectory>../../src/plugins/websocket/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
plugins/xmldebugger/pom.xml → src/plugins/xmldebugger/pom.xml
View file @ 79ae79bf
......@@ -11,7 +11,7 @@
<name>XML Debugger Plugin</name>
<build>
<sourceDirectory>../../src/plugins/xmldebugger/src/java</sourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
......
xmppserver/pom.xml
View file @ 79ae79bf
......@@ -102,6 +102,12 @@
<groupId>org.igniterealtime</groupId>
<artifactId>tinder</artifactId>
<version>1.3.0</version>
<exclusions>
<exclusion> <!-- Exclude the older SLF4J dependency that's defined in Tinder -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- XML, Dom4J, XPP -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023