From c5216fd95bb9ccaaff1b4cdadcc11fbebc43f4c4 Mon Sep 17 00:00:00 2001
From: Richie Jefts <rjefts@gmail.com>
Date: Tue, 12 Apr 2011 21:34:34 -0500
Subject: [PATCH 1/2] Create a pom.xml file. Update twitter4j to the latest.

---
 pom.xml                                       | 66 +++++++++++++++++++
 src/main/assembly/package.xml                 | 37 +++++++++++
 .../com/wimbli/serverevents/DataParser.java   |  0
 .../com/wimbli/serverevents/DataSource.java   |  0
 .../wimbli/serverevents/DataSourceChat.java   |  0
 .../serverevents/DataSourceDatabase.java      |  0
 .../wimbli/serverevents/DataSourceFile.java   |  0
 .../serverevents/DataSourceTwitter.java       |  0
 .../com/wimbli/serverevents/DeathThread.java  |  0
 .../com/wimbli/serverevents/DeathType.java    |  0
 .../wimbli/serverevents/DefaultConfig.java    |  0
 .../wimbli/serverevents/DisplayThread.java    |  0
 .../com/wimbli/serverevents/Message.java      |  0
 .../com/wimbli/serverevents/Messages.java     |  0
 .../java}/com/wimbli/serverevents/Misc.java   |  0
 .../serverevents/RandomMessageThread.java     |  0
 .../com/wimbli/serverevents/Register.java     |  0
 .../com/wimbli/serverevents/ServerEvents.java |  0
 .../ServerEventsEntityListener.java           |  0
 .../ServerEventsPlayerListener.java           |  0
 .../serverevents/TwitterDisplayThread.java    |  0
 src/{ => main/resources}/plugin.yml           |  0
 22 files changed, 103 insertions(+)
 create mode 100644 pom.xml
 create mode 100644 src/main/assembly/package.xml
 rename src/{ => main/java}/com/wimbli/serverevents/DataParser.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DataSource.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DataSourceChat.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DataSourceDatabase.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DataSourceFile.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DataSourceTwitter.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DeathThread.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DeathType.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DefaultConfig.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/DisplayThread.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/Message.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/Messages.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/Misc.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/RandomMessageThread.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/Register.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/ServerEvents.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/ServerEventsEntityListener.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/ServerEventsPlayerListener.java (100%)
 rename src/{ => main/java}/com/wimbli/serverevents/TwitterDisplayThread.java (100%)
 rename src/{ => main/resources}/plugin.yml (100%)

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..846b46c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,66 @@
+<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>
+    <groupId>com.wimbli.serverevents</groupId>
+    <artifactId>ServerEvents</artifactId>
+    <version>0.1</version>
+    <name>ServerEvents</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>ServerEvents</classpathPrefix>
+                            <mainClass>com.wimbli.serverevents.Register</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.twitter4j</groupId>
+            <artifactId>twitter4j-core</artifactId>
+            <version>[2.1,)</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
new file mode 100644
index 0000000..4e1f7ae
--- /dev/null
+++ b/src/main/assembly/package.xml
@@ -0,0 +1,37 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>com.wimbli.serverevents:ServerEvents</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/ServerEvents</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <excludes>
+                <exclude>com.wimbli.serverevents:ServerEvents</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+                <include>CHANGELOG*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/com/wimbli/serverevents/DataParser.java b/src/main/java/com/wimbli/serverevents/DataParser.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataParser.java
rename to src/main/java/com/wimbli/serverevents/DataParser.java
diff --git a/src/com/wimbli/serverevents/DataSource.java b/src/main/java/com/wimbli/serverevents/DataSource.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataSource.java
rename to src/main/java/com/wimbli/serverevents/DataSource.java
diff --git a/src/com/wimbli/serverevents/DataSourceChat.java b/src/main/java/com/wimbli/serverevents/DataSourceChat.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataSourceChat.java
rename to src/main/java/com/wimbli/serverevents/DataSourceChat.java
diff --git a/src/com/wimbli/serverevents/DataSourceDatabase.java b/src/main/java/com/wimbli/serverevents/DataSourceDatabase.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataSourceDatabase.java
rename to src/main/java/com/wimbli/serverevents/DataSourceDatabase.java
diff --git a/src/com/wimbli/serverevents/DataSourceFile.java b/src/main/java/com/wimbli/serverevents/DataSourceFile.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataSourceFile.java
rename to src/main/java/com/wimbli/serverevents/DataSourceFile.java
diff --git a/src/com/wimbli/serverevents/DataSourceTwitter.java b/src/main/java/com/wimbli/serverevents/DataSourceTwitter.java
similarity index 100%
rename from src/com/wimbli/serverevents/DataSourceTwitter.java
rename to src/main/java/com/wimbli/serverevents/DataSourceTwitter.java
diff --git a/src/com/wimbli/serverevents/DeathThread.java b/src/main/java/com/wimbli/serverevents/DeathThread.java
similarity index 100%
rename from src/com/wimbli/serverevents/DeathThread.java
rename to src/main/java/com/wimbli/serverevents/DeathThread.java
diff --git a/src/com/wimbli/serverevents/DeathType.java b/src/main/java/com/wimbli/serverevents/DeathType.java
similarity index 100%
rename from src/com/wimbli/serverevents/DeathType.java
rename to src/main/java/com/wimbli/serverevents/DeathType.java
diff --git a/src/com/wimbli/serverevents/DefaultConfig.java b/src/main/java/com/wimbli/serverevents/DefaultConfig.java
similarity index 100%
rename from src/com/wimbli/serverevents/DefaultConfig.java
rename to src/main/java/com/wimbli/serverevents/DefaultConfig.java
diff --git a/src/com/wimbli/serverevents/DisplayThread.java b/src/main/java/com/wimbli/serverevents/DisplayThread.java
similarity index 100%
rename from src/com/wimbli/serverevents/DisplayThread.java
rename to src/main/java/com/wimbli/serverevents/DisplayThread.java
diff --git a/src/com/wimbli/serverevents/Message.java b/src/main/java/com/wimbli/serverevents/Message.java
similarity index 100%
rename from src/com/wimbli/serverevents/Message.java
rename to src/main/java/com/wimbli/serverevents/Message.java
diff --git a/src/com/wimbli/serverevents/Messages.java b/src/main/java/com/wimbli/serverevents/Messages.java
similarity index 100%
rename from src/com/wimbli/serverevents/Messages.java
rename to src/main/java/com/wimbli/serverevents/Messages.java
diff --git a/src/com/wimbli/serverevents/Misc.java b/src/main/java/com/wimbli/serverevents/Misc.java
similarity index 100%
rename from src/com/wimbli/serverevents/Misc.java
rename to src/main/java/com/wimbli/serverevents/Misc.java
diff --git a/src/com/wimbli/serverevents/RandomMessageThread.java b/src/main/java/com/wimbli/serverevents/RandomMessageThread.java
similarity index 100%
rename from src/com/wimbli/serverevents/RandomMessageThread.java
rename to src/main/java/com/wimbli/serverevents/RandomMessageThread.java
diff --git a/src/com/wimbli/serverevents/Register.java b/src/main/java/com/wimbli/serverevents/Register.java
similarity index 100%
rename from src/com/wimbli/serverevents/Register.java
rename to src/main/java/com/wimbli/serverevents/Register.java
diff --git a/src/com/wimbli/serverevents/ServerEvents.java b/src/main/java/com/wimbli/serverevents/ServerEvents.java
similarity index 100%
rename from src/com/wimbli/serverevents/ServerEvents.java
rename to src/main/java/com/wimbli/serverevents/ServerEvents.java
diff --git a/src/com/wimbli/serverevents/ServerEventsEntityListener.java b/src/main/java/com/wimbli/serverevents/ServerEventsEntityListener.java
similarity index 100%
rename from src/com/wimbli/serverevents/ServerEventsEntityListener.java
rename to src/main/java/com/wimbli/serverevents/ServerEventsEntityListener.java
diff --git a/src/com/wimbli/serverevents/ServerEventsPlayerListener.java b/src/main/java/com/wimbli/serverevents/ServerEventsPlayerListener.java
similarity index 100%
rename from src/com/wimbli/serverevents/ServerEventsPlayerListener.java
rename to src/main/java/com/wimbli/serverevents/ServerEventsPlayerListener.java
diff --git a/src/com/wimbli/serverevents/TwitterDisplayThread.java b/src/main/java/com/wimbli/serverevents/TwitterDisplayThread.java
similarity index 100%
rename from src/com/wimbli/serverevents/TwitterDisplayThread.java
rename to src/main/java/com/wimbli/serverevents/TwitterDisplayThread.java
diff --git a/src/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from src/plugin.yml
rename to src/main/resources/plugin.yml

From 821fecd2fcff930f4d5364a5b89a9adcacb62d38 Mon Sep 17 00:00:00 2001
From: Richie Jefts <rjefts@gmail.com>
Date: Tue, 12 Apr 2011 21:37:44 -0500
Subject: [PATCH 2/2] Missed these files on last commit

---
 pom.xml                                       |  2 +-
 .../com/wimbli/serverevents/Register.java     | 24 +++++++++----------
 src/main/resources/plugin.yml                 |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 846b46c..9cbccbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.wimbli.serverevents</groupId>
     <artifactId>ServerEvents</artifactId>
-    <version>0.1</version>
+    <version>1.3.7</version>
     <name>ServerEvents</name>
     <build>
         <plugins>
diff --git a/src/main/java/com/wimbli/serverevents/Register.java b/src/main/java/com/wimbli/serverevents/Register.java
index af9557f..daaea18 100644
--- a/src/main/java/com/wimbli/serverevents/Register.java
+++ b/src/main/java/com/wimbli/serverevents/Register.java
@@ -21,9 +21,9 @@
 import twitter4j.Twitter;
 import twitter4j.TwitterException;
 import twitter4j.TwitterFactory;
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.RequestToken;
 import twitter4j.conf.ConfigurationBuilder;
-import twitter4j.http.AccessToken;
-import twitter4j.http.RequestToken;
 
 /**
  * Example application that uses OAuth method to acquire access to your account.<br>
@@ -37,21 +37,21 @@ public final class Register {
      *
      * @param args message
      */
-	public static void main(String[] args) {
+    public static void main(String[] args) {
         try {
-        	ConfigurationBuilder cb = new ConfigurationBuilder();
-        	cb.setDebugEnabled(true)
-        	  .setOAuthConsumerKey("QyuUqx8UFaRLMWORQinphg")
-        	  .setOAuthConsumerSecret("EWORHYNo3JkJgvihiGwFL8tWNHExyhWFilR1Q");
-        	
-        	
+            ConfigurationBuilder cb = new ConfigurationBuilder();
+            cb.setDebugEnabled(true)
+              .setOAuthConsumerKey("QyuUqx8UFaRLMWORQinphg")
+              .setOAuthConsumerSecret("EWORHYNo3JkJgvihiGwFL8tWNHExyhWFilR1Q");
+
+
             Twitter twitter = new TwitterFactory(cb.build()).getInstance();
             AccessToken accessToken = null;
             try {
                 // get request token.
                 // this will throw IllegalStateException if access token is already available
                 RequestToken requestToken = twitter.getOAuthRequestToken();
-                
+
 
                 BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
                 while (null == accessToken) {
@@ -82,7 +82,7 @@ public static void main(String[] args) {
                 }
             }
             System.out.println("Successfully connected to Twitter.");
-            
+
             System.out.println("\n\n*********************");
             System.out.println("***** IMPORTANT *****");
             System.out.println("**************************************************************");
@@ -90,7 +90,7 @@ public static void main(String[] args) {
             System.out.println("accessToken=\"" + accessToken.getToken()+"\"");
             System.out.println("accessTokenSecret=\"" + accessToken.getTokenSecret()+"\"");
             System.out.println("**************************************************************");
-            
+
             System.out.println("Restart the minecraft server now.");
             System.exit(0);
         } catch (TwitterException te) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 21d2f37..862c234 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,3 +1,3 @@
 name: ServerEvents
 main: com.wimbli.serverevents.ServerEvents
-version: 1.3.6
\ No newline at end of file
+version: 1.3.7
\ No newline at end of file