adminsys/agirbot
adminsys/agirbot
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactored packages from fr.imirhil.april.* to org.april.*

Browse Source
This commit is contained in:
Christian P. MOMON 2017-12-14 21:57:51 +01:00
parent ab223bb6be
commit ca0f25afb2
33 changed files with 84 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/org.sonar.ide.eclipse.core.prefs
View File

@ -1,6 +1,6 @@
analyseLocally=false analyseLocally=false
eclipse.preferences.version=1 eclipse.preferences.version=1
extraProperties= extraProperties=
projectKey=fr.imirhil.april\:hebdobot projectKey=org.april\:hebdobot
serverUrl=http\://localhost\:9000 serverUrl=http\://localhost\:9000
version=2 version=2

12
conf.sample.xml
View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="fr.imirhil.april.hebdobot" /> <context:component-scan base-package="org.april.hebdobot" />
<bean id="properties" <bean id="properties"
class="org.springframework.beans.factory.config.PropertiesFactoryBean"> class="org.springframework.beans.factory.config.PropertiesFactoryBean">
@ -14,21 +14,21 @@
</property> </property>
</bean> </bean>
<bean id="userAliases" class="fr.imirhil.april.hebdobot.xml.UserAlias"> <bean id="userAliases" class="org.april.hebdobot.xml.UserAlias">
<constructor-arg name="source" value="file:users.xml" /> <constructor-arg name="source" value="file:users.xml" />
</bean> </bean>
<bean id="bot" class="fr.imirhil.april.hebdobot.irc.Bot" <bean id="bot" class="org.april.hebdobot.irc.Bot"
init-method="init" destroy-method="close"> init-method="init" destroy-method="close">
<constructor-arg name="host" value="irc.freenode.org" /> <constructor-arg name="host" value="irc.freenode.org" />
<constructor-arg name="port" value="6667" /> <constructor-arg name="port" value="6667" />
<constructor-arg name="name" value="Hebdobot" /> <constructor-arg name="name" value="Hebdobot" />
<constructor-arg name="channel" value="#april" /> <constructor-arg name="channel" value="#april" />
</bean> </bean>
<bean id="pastebin" class="fr.imirhil.april.hebdobot.pastebin.PastebinClient"> <bean id="pastebin" class="org.april.hebdobot.pastebin.PastebinClient">
<constructor-arg name="apiKey" <constructor-arg name="apiKey"
value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" /> value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" />
</bean> </bean>
<bean id="identi.ca" class="fr.imirhil.april.hebdobot.statusnet.IdentiCaClient"> <bean id="identi.ca" class="org.april.hebdobot.statusnet.IdentiCaClient">
<constructor-arg name="apiKey" <constructor-arg name="apiKey"
value="ef8ad74a5ab4a92138ff397763776a14" /> value="ef8ad74a5ab4a92138ff397763776a14" />
<constructor-arg name="apiSecret" <constructor-arg name="apiSecret"
@ -39,7 +39,7 @@
value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" /> value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" />
</bean> </bean>
<bean id="job" class="fr.imirhil.april.hebdobot.Job"> <bean id="job" class="org.april.hebdobot.Job">
<property name="statusNetMessage" <property name="statusNetMessage"
value="Revue hebdomadaire !april dans %dmin sur irc://irc.freenode.org/april ou http://webchat.freenode.net/?channels=april" /> value="Revue hebdomadaire !april dans %dmin sur irc://irc.freenode.org/april ou http://webchat.freenode.net/?channels=april" />
<property name="ircMessage" value="Revue hebdomadaire dans %dmin" /> <property name="ircMessage" value="Revue hebdomadaire dans %dmin" />

2
exe/daemon.sh
View File

@ -4,7 +4,7 @@ NAME=hebdobot
BASE_DIR=$HOME/$NAME BASE_DIR=$HOME/$NAME
PID_FILE=$BASE_DIR/$NAME.pid PID_FILE=$BASE_DIR/$NAME.pid
DAEMON=java DAEMON=java
DAEMON_ARGS="-cp *:lib/* fr.imirhil.april.hebdobot.Application" DAEMON_ARGS="-cp *:lib/* org.april.hebdobot.Application"
CMD="/sbin/start-stop-daemon --chdir $BASE_DIR --quiet --make-pidfile --pidfile $PID_FILE --exec $DAEMON" CMD="/sbin/start-stop-daemon --chdir $BASE_DIR --quiet --make-pidfile --pidfile $PID_FILE --exec $DAEMON"
case "$1" in case "$1" in

2
exe/hebdobot.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
java -cp '*:lib/*' fr.imirhil.april.hebdobot.Application java -cp '*:lib/*' org.april.hebdobot.Application

4
launch4j.xml
View File

@ -10,11 +10,11 @@
<stayAlive>false</stayAlive> <stayAlive>false</stayAlive>
<icon>hebdobot.ico</icon> <icon>hebdobot.ico</icon>
<classPath> <classPath>
<mainClass>fr.imirhil..april.hebdobot.Bot</mainClass> <mainClass>org.april.hebdobot.Bot</mainClass>
<cp>lib/*</cp> <cp>lib/*</cp>
</classPath> </classPath>
<jre> <jre>
<minVersion>1.6.0</minVersion> <minVersion>1.7.0</minVersion>
<jdkPreference>preferJre</jdkPreference> <jdkPreference>preferJre</jdkPreference>
</jre> </jre>
</launch4jConfig> </launch4jConfig>

6
pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>fr.imirhil.april</groupId> <groupId>org.april</groupId>
<artifactId>hebdobot</artifactId> <artifactId>hebdobot</artifactId>
<version>1.2.3-SNAPSHOT</version> <version>1.2.3-SNAPSHOT</version>
<scm> <scm>
@ -28,8 +28,8 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<schemaDirectory>${basedir}/src/main/resources/fr/imirhil/april/hebdobot</schemaDirectory> <schemaDirectory>${basedir}/src/main/resources/org/april/hebdobot</schemaDirectory>
<bindingDirectory>${basedir}/src/main/resources/fr/imirhil/april/hebdobot</bindingDirectory> <bindingDirectory>${basedir}/src/main/resources/org/april/hebdobot</bindingDirectory>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

15
src/main/java/fr/imirhil/april/hebdobot/Application.java → src/main/java/org/april/hebdobot/Application.java
View File

@ -17,24 +17,23 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot; package org.april.hebdobot;
import java.io.File; import java.io.File;
import java.util.Properties; import java.util.Properties;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.april.hebdobot.irc.Hebdobot;
import org.april.hebdobot.irc.ReviewListener;
import org.april.hebdobot.pastebin.PastebinClient;
import org.april.hebdobot.pastebin.Private;
import org.april.hebdobot.review.Review;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat; import org.joda.time.format.ISODateTimeFormat;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.support.FileSystemXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext;
import fr.imirhil.april.hebdobot.irc.Hebdobot;
import fr.imirhil.april.hebdobot.irc.ReviewListener;
import fr.imirhil.april.hebdobot.pastebin.PastebinClient;
import fr.imirhil.april.hebdobot.pastebin.Private;
import fr.imirhil.april.hebdobot.review.Review;
/** /**
* The Class Application. * The Class Application.
*/ */
@ -63,7 +62,7 @@ public class Application implements ReviewListener
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.ReviewListener#onEnd(fr.imirhil.april.hebdobot.review.Review) * @see org.april.hebdobot.irc.ReviewListener#onEnd(org.april.hebdobot.review.Review)
*/ */
@Override @Override
public void onEnd(final Review review) public void onEnd(final Review review)

2
src/main/java/fr/imirhil/april/hebdobot/Context.java → src/main/java/org/april/hebdobot/Context.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot; package org.april.hebdobot;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

5
src/main/java/fr/imirhil/april/hebdobot/Job.java → src/main/java/org/april/hebdobot/Job.java
View File

@ -17,14 +17,13 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot; package org.april.hebdobot;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.april.hebdobot.irc.Hebdobot;
import org.springframework.social.twitter.api.impl.TwitterTemplate; import org.springframework.social.twitter.api.impl.TwitterTemplate;
import fr.imirhil.april.hebdobot.irc.Hebdobot;
/** /**
* The Class Job. * The Class Job.
*/ */

2
src/main/java/fr/imirhil/april/hebdobot/OAuthRegistration.java → src/main/java/org/april/hebdobot/OAuthRegistration.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot; package org.april.hebdobot;
import java.util.Scanner; import java.util.Scanner;

2
src/main/java/fr/imirhil/april/hebdobot/irc/Handler.java → src/main/java/org/april/hebdobot/irc/Handler.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.irc; package org.april.hebdobot.irc;
/** /**
* The Class Handler. * The Class Handler.

41
src/main/java/fr/imirhil/april/hebdobot/irc/Hebdobot.java → src/main/java/org/april/hebdobot/irc/Hebdobot.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.irc; package org.april.hebdobot.irc;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
@ -26,17 +26,16 @@ import java.util.List;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.april.hebdobot.Context;
import org.april.hebdobot.review.CollectiveTopic;
import org.april.hebdobot.review.IndividualTopic;
import org.april.hebdobot.review.Message;
import org.april.hebdobot.review.Review;
import org.april.hebdobot.review.Topic;
import org.jibble.pircbot.PircBot; import org.jibble.pircbot.PircBot;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fr.imirhil.april.hebdobot.Context;
import fr.imirhil.april.hebdobot.review.CollectiveTopic;
import fr.imirhil.april.hebdobot.review.IndividualTopic;
import fr.imirhil.april.hebdobot.review.Message;
import fr.imirhil.april.hebdobot.review.Review;
import fr.imirhil.april.hebdobot.review.Topic;
/** /**
* The Class Bot. * The Class Bot.
*/ */
@ -149,7 +148,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -159,7 +158,8 @@ public class Hebdobot extends PircBot
if (StringUtils.equalsIgnoreCase(message, "!help")) if (StringUtils.equalsIgnoreCase(message, "!help"))
{ {
Hebdobot.this.sendMessage(sender, "Bienvenue " + sender); Hebdobot.this.sendMessage(sender, "Bienvenue " + sender);
Hebdobot.this.sendMessage(sender, "Je suis " + Hebdobot.this.getName() + ", le robot de gestion des revues hebdomadaires de l'APRIL"); Hebdobot.this.sendMessage(sender,
"Je suis " + Hebdobot.this.getName() + ", le robot de gestion des revues hebdomadaires de l'APRIL");
Hebdobot.this.sendMessage(sender, "Voici les commandes que je comprend :"); Hebdobot.this.sendMessage(sender, "Voici les commandes que je comprend :");
Hebdobot.this.sendMessage(sender, " "); Hebdobot.this.sendMessage(sender, " ");
Hebdobot.this.sendMessage(sender, "— !debut : commencer une nouvelle revue"); Hebdobot.this.sendMessage(sender, "— !debut : commencer une nouvelle revue");
@ -185,7 +185,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -216,7 +216,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -247,7 +247,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -292,7 +292,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -336,7 +336,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -373,7 +373,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -405,7 +405,8 @@ public class Hebdobot extends PircBot
} }
else else
{ {
Hebdobot.this.sendMessage(String.format("Les participants suivants sont manquants : %1s", StringUtils.join(missing, ", "))); Hebdobot.this
.sendMessage(String.format("Les participants suivants sont manquants : %1s", StringUtils.join(missing, ", ")));
result = true; result = true;
} }
} }
@ -420,7 +421,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -459,7 +460,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)
@ -485,7 +486,7 @@ public class Hebdobot extends PircBot
this.handlers.add(new Handler() this.handlers.add(new Handler()
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
*/ */
@Override @Override
public boolean handle(final String sender, final String message) public boolean handle(final String sender, final String message)

4
src/main/java/fr/imirhil/april/hebdobot/irc/ReviewListener.java → src/main/java/org/april/hebdobot/irc/ReviewListener.java
View File

@ -17,9 +17,9 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.irc; package org.april.hebdobot.irc;
import fr.imirhil.april.hebdobot.review.Review; import org.april.hebdobot.review.Review;
/** /**
* The listener interface for receiving review events. The class that is * The listener interface for receiving review events. The class that is

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/APIException.java → src/main/java/org/april/hebdobot/pastebin/APIException.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
public class APIException extends Exception public class APIException extends Exception
{ {

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/Expiration.java → src/main/java/org/april/hebdobot/pastebin/Expiration.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
/** /**
* The Enum Expiration. * The Enum Expiration.

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/Format.java → src/main/java/org/april/hebdobot/pastebin/Format.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
/** /**
* The Enum Format. * The Enum Format.

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/Option.java → src/main/java/org/april/hebdobot/pastebin/Option.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
/** /**
* The Enum Option. * The Enum Option.

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/PastebinClient.java → src/main/java/org/april/hebdobot/pastebin/PastebinClient.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;

2
src/main/java/fr/imirhil/april/hebdobot/pastebin/Private.java → src/main/java/org/april/hebdobot/pastebin/Private.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
/** /**
* The Enum Private. * The Enum Private.

6
src/main/java/fr/imirhil/april/hebdobot/review/CollectiveTopic.java → src/main/java/org/april/hebdobot/review/CollectiveTopic.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -44,7 +44,7 @@ public class CollectiveTopic extends Topic
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.review.Topic#add(fr.imirhil.april.hebdobot.review.Message) * @see org.april.hebdobot.review.Topic#add(org.april.hebdobot.review.Message)
*/ */
@Override @Override
public void add(final Message message) public void add(final Message message)
@ -63,7 +63,7 @@ public class CollectiveTopic extends Topic
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.review.Topic#getParticipants() * @see org.april.hebdobot.review.Topic#getParticipants()
*/ */
@Override @Override
public Set<String> getParticipants() public Set<String> getParticipants()

6
src/main/java/fr/imirhil/april/hebdobot/review/IndividualTopic.java → src/main/java/org/april/hebdobot/review/IndividualTopic.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -44,7 +44,7 @@ public class IndividualTopic extends Topic
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.review.Topic#add(fr.imirhil.april.hebdobot.review.Message) * @see org.april.hebdobot.review.Topic#add(org.april.hebdobot.review.Message)
*/ */
@Override @Override
public void add(final Message message) public void add(final Message message)
@ -70,7 +70,7 @@ public class IndividualTopic extends Topic
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.review.Topic#getParticipants() * @see org.april.hebdobot.review.Topic#getParticipants()
*/ */
@Override @Override
public Set<String> getParticipants() public Set<String> getParticipants()

2
src/main/java/fr/imirhil/april/hebdobot/review/Message.java → src/main/java/org/april/hebdobot/review/Message.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import org.joda.time.DateTime; import org.joda.time.DateTime;

2
src/main/java/fr/imirhil/april/hebdobot/review/Messages.java → src/main/java/org/april/hebdobot/review/Messages.java
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import java.util.LinkedList; import java.util.LinkedList;

7
src/main/java/fr/imirhil/april/hebdobot/review/Review.java → src/main/java/org/april/hebdobot/review/Review.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@ -26,12 +26,11 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.april.hebdobot.Context;
import org.april.hebdobot.xml.UserAlias;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormat;
import fr.imirhil.april.hebdobot.Context;
import fr.imirhil.april.hebdobot.xml.UserAlias;
/** /**
* The Class Review. * The Class Review.
*/ */

2
src/main/java/fr/imirhil/april/hebdobot/review/Topic.java → src/main/java/org/april/hebdobot/review/Topic.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.review; package org.april.hebdobot.review;
import java.util.Set; import java.util.Set;

4
src/main/java/fr/imirhil/april/hebdobot/xml/UserAlias.java → src/main/java/org/april/hebdobot/xml/UserAlias.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.xml; package org.april.hebdobot.xml;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashMap; import java.util.HashMap;
@ -53,7 +53,7 @@ public class UserAlias
{ {
final Unmarshaller unmarshaller = JAXBContext.newInstance(Users.class).createUnmarshaller(); final Unmarshaller unmarshaller = JAXBContext.newInstance(Users.class).createUnmarshaller();
unmarshaller.setSchema(SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI) unmarshaller.setSchema(SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI)
.newSchema(UserAlias.class.getResource("/fr/imirhil/april/hebdobot/users.xsd"))); .newSchema(UserAlias.class.getResource("/org/april/hebdobot/users.xsd")));
for (final User user : unmarshaller.unmarshal(new StreamSource(source), Users.class).getValue().getUser()) for (final User user : unmarshaller.unmarshal(new StreamSource(source), Users.class).getValue().getUser())
{ {

2
src/main/resources/log4j.properties
View File

@ -1,6 +1,6 @@
log4j.rootLogger = warn, stdout log4j.rootLogger = warn, stdout
log4j.logger.fr.imirhil.april.hebdobot = info log4j.logger.org.april.hebdobot = info
log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout = org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout = org.apache.log4j.PatternLayout log4j.appender.stdout.layout = org.apache.log4j.PatternLayout

2
src/main/resources/fr/imirhil/april/hebdobot/users.xjb → src/main/resources/org/april/hebdobot/users.xjb
View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" version="2.1"> xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" version="2.1">
<bindings schemaLocation="users.xsd"> <bindings schemaLocation="users.xsd">
<schemaBindings> <schemaBindings>
<package name="fr.imirhil.april.hebdobot.xml" /> <package name="org.april.hebdobot.xml" />
</schemaBindings> </schemaBindings>
</bindings> </bindings>
</bindings> </bindings>

0
src/main/resources/fr/imirhil/april/hebdobot/users.xsd → src/main/resources/org/april/hebdobot/users.xsd
View File

13
src/test/java/fr/imirhil/april/hebdobot/irc/BotTest.java → src/test/java/org/april/hebdobot/irc/BotTest.java
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.irc; package org.april.hebdobot.irc;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -29,6 +29,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.april.hebdobot.review.Review;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat; import org.joda.time.format.ISODateTimeFormat;
import org.junit.Test; import org.junit.Test;
@ -36,13 +37,11 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import fr.imirhil.april.hebdobot.review.Review;
/** /**
* The Class BotTest. * The Class BotTest.
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "/fr/imirhil/april/hebdobot/conf.xml") @ContextConfiguration(locations = "/org/april/hebdobot/conf.xml")
public class BotTest implements ReviewListener public class BotTest implements ReviewListener
{ {
/** /**
@ -62,7 +61,7 @@ public class BotTest implements ReviewListener
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.Bot#onMessage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) * @see org.april.hebdobot.irc.Bot#onMessage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
*/ */
@Override @Override
public void onMessage(final String channel, final String sender, final String login, final String hostname, final String message) public void onMessage(final String channel, final String sender, final String login, final String hostname, final String message)
@ -72,7 +71,7 @@ public class BotTest implements ReviewListener
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.imirhil.april.hebdobot.irc.ReviewListener#onEnd(fr.imirhil.april.hebdobot.review.Review) * @see org.april.hebdobot.irc.ReviewListener#onEnd(org.april.hebdobot.review.Review)
*/ */
@Override @Override
public void onEnd(final Review review) public void onEnd(final Review review)
@ -102,7 +101,7 @@ public class BotTest implements ReviewListener
final Hebdobot bot = new BotMock(); final Hebdobot bot = new BotMock();
bot.add(this); bot.add(this);
final InputStream is = BotTest.class.getResourceAsStream("/fr/imirhil/april/hebdobot/review.log"); final InputStream is = BotTest.class.getResourceAsStream("/org/april/hebdobot/review.log");
if (is == null) if (is == null)
{ {
return; return;

4
src/test/java/fr/imirhil/april/hebdobot/pastebin/PastebinClientTest.java → src/test/java/org/april/hebdobot/pastebin/PastebinClientTest.java
View File

@ -17,8 +17,10 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see <http://www.gnu.org/licenses/> * along with Hebdobot. If not, see <http://www.gnu.org/licenses/>
*/ */
package fr.imirhil.april.hebdobot.pastebin; package org.april.hebdobot.pastebin;
import org.april.hebdobot.pastebin.Expiration;
import org.april.hebdobot.pastebin.PastebinClient;
import org.junit.Test; import org.junit.Test;
/** /**

8
src/test/resources/fr/imirhil/april/hebdobot/conf.xml → src/test/resources/org/april/hebdobot/conf.xml
View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="fr.imirhil.april.hebdobot" /> <context:component-scan base-package="org.april.hebdobot" />
<bean id="properties" <bean id="properties"
class="org.springframework.beans.factory.config.PropertiesFactoryBean"> class="org.springframework.beans.factory.config.PropertiesFactoryBean">
@ -14,9 +14,9 @@
</property> </property>
</bean> </bean>
<bean id="userAliases" class="fr.imirhil.april.hebdobot.xml.UserAlias"> <bean id="userAliases" class="org.april.hebdobot.xml.UserAlias">
<constructor-arg name="source" value="classpath:/fr/imirhil/april/hebdobot/users.xml" /> <constructor-arg name="source" value="classpath:/org/april/hebdobot/users.xml" />
</bean> </bean>
<bean id="bot" class="fr.imirhil.april.hebdobot.irc.BotTest.BotMock" /> <bean id="bot" class="org.april.hebdobot.irc.BotTest.BotMock" />
</beans> </beans>

0
src/test/resources/fr/imirhil/april/hebdobot/users.xml → src/test/resources/org/april/hebdobot/users.xml
View File