Merge branch 'develop'

* develop: Renamed package.
evanwong · Oct 16, 2014 · 6780518 · 6780518
2 parents 71f0878 + 9199a53
commit 6780518
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/src/main/java/io/evanwong/hipchat/v2/commons/NoContent.java b/src/main/java/io/evanwong/hipchat/v2/commons/NoContent.java
diff --git a/...io/evanwong/hipchat/v2/HipChatClient.java → ...vanwong/oss/hipchat/v2/HipChatClient.java b/...io/evanwong/hipchat/v2/HipChatClient.java → ...vanwong/oss/hipchat/v2/HipChatClient.java
@@ -1,7 +1,7 @@
-package io.evanwong.hipchat.v2;
+package io.evanwong.oss.hipchat.v2;
 
-import io.evanwong.hipchat.v2.rooms.GetAllRoomsRequestBuilder;
-import io.evanwong.hipchat.v2.rooms.SendRoomNotificationRequestBuilder;
+import io.evanwong.oss.hipchat.v2.rooms.GetAllRoomsRequestBuilder;
+import io.evanwong.oss.hipchat.v2.rooms.SendRoomNotificationRequestBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;

diff --git a/.../v2/commons/ExpandableRequestBuilder.java → .../v2/commons/ExpandableRequestBuilder.java b/.../v2/commons/ExpandableRequestBuilder.java → .../v2/commons/ExpandableRequestBuilder.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 import org.apache.http.client.HttpClient;
 

diff --git a/...anwong/hipchat/v2/commons/GetRequest.java → ...ng/oss/hipchat/v2/commons/GetRequest.java b/...anwong/hipchat/v2/commons/GetRequest.java → ...ng/oss/hipchat/v2/commons/GetRequest.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;

diff --git a/src/main/java/io/evanwong/oss/hipchat/v2/commons/NoContent.java b/src/main/java/io/evanwong/oss/hipchat/v2/commons/NoContent.java
@@ -0,0 +1,4 @@
+package io.evanwong.oss.hipchat.v2.commons;
+
+public class NoContent {
+}
diff --git a/...nwong/hipchat/v2/commons/PagingLinks.java → ...g/oss/hipchat/v2/commons/PagingLinks.java b/...nwong/hipchat/v2/commons/PagingLinks.java → ...g/oss/hipchat/v2/commons/PagingLinks.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 public class PagingLinks {
     private String self;

diff --git a/...nwong/hipchat/v2/commons/PostRequest.java → ...g/oss/hipchat/v2/commons/PostRequest.java b/...nwong/hipchat/v2/commons/PostRequest.java → ...g/oss/hipchat/v2/commons/PostRequest.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;

diff --git a/.../evanwong/hipchat/v2/commons/Request.java → ...nwong/oss/hipchat/v2/commons/Request.java b/.../evanwong/hipchat/v2/commons/Request.java → ...nwong/oss/hipchat/v2/commons/Request.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;

diff --git a/...ng/hipchat/v2/commons/RequestBuilder.java → ...ss/hipchat/v2/commons/RequestBuilder.java b/...ng/hipchat/v2/commons/RequestBuilder.java → ...ss/hipchat/v2/commons/RequestBuilder.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.commons;
+package io.evanwong.oss.hipchat.v2.commons;
 
 import org.apache.http.client.HttpClient;
 

diff --git a/.../hipchat/v2/rooms/GetAllRoomsRequest.java → .../hipchat/v2/rooms/GetAllRoomsRequest.java b/.../hipchat/v2/rooms/GetAllRoomsRequest.java → .../hipchat/v2/rooms/GetAllRoomsRequest.java
@@ -1,6 +1,6 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
-import io.evanwong.hipchat.v2.commons.GetRequest;
+import io.evanwong.oss.hipchat.v2.commons.GetRequest;
 import org.apache.http.client.HttpClient;
 
 import java.util.HashMap;

diff --git a/...t/v2/rooms/GetAllRoomsRequestBuilder.java → ...t/v2/rooms/GetAllRoomsRequestBuilder.java b/...t/v2/rooms/GetAllRoomsRequestBuilder.java → ...t/v2/rooms/GetAllRoomsRequestBuilder.java
@@ -1,6 +1,6 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
-import io.evanwong.hipchat.v2.commons.ExpandableRequestBuilder;
+import io.evanwong.oss.hipchat.v2.commons.ExpandableRequestBuilder;
 import org.apache.http.client.HttpClient;
 
 import java.util.concurrent.ExecutorService;

diff --git a/...anwong/hipchat/v2/rooms/MessageColor.java → ...ng/oss/hipchat/v2/rooms/MessageColor.java b/...anwong/hipchat/v2/rooms/MessageColor.java → ...ng/oss/hipchat/v2/rooms/MessageColor.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
 public enum MessageColor {
 

diff --git a/...nwong/hipchat/v2/rooms/MessageFormat.java → ...g/oss/hipchat/v2/rooms/MessageFormat.java b/...nwong/hipchat/v2/rooms/MessageFormat.java → ...g/oss/hipchat/v2/rooms/MessageFormat.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
 public enum MessageFormat {
     HTML("html"), TEXT("text");

diff --git a/...va/io/evanwong/hipchat/v2/rooms/Room.java → ...o/evanwong/oss/hipchat/v2/rooms/Room.java b/...va/io/evanwong/hipchat/v2/rooms/Room.java → ...o/evanwong/oss/hipchat/v2/rooms/Room.java
@@ -1,6 +1,6 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
-import io.evanwong.hipchat.v2.commons.PagingLinks;
+import io.evanwong.oss.hipchat.v2.commons.PagingLinks;
 
 import java.util.List;
 

diff --git a/...o/evanwong/hipchat/v2/rooms/RoomItem.java → ...anwong/oss/hipchat/v2/rooms/RoomItem.java b/...o/evanwong/hipchat/v2/rooms/RoomItem.java → ...anwong/oss/hipchat/v2/rooms/RoomItem.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
 public class RoomItem {
     private Long id;

diff --git a/.../evanwong/hipchat/v2/rooms/RoomLinks.java → ...nwong/oss/hipchat/v2/rooms/RoomLinks.java b/.../evanwong/hipchat/v2/rooms/RoomLinks.java → ...nwong/oss/hipchat/v2/rooms/RoomLinks.java
@@ -1,4 +1,4 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
 public class RoomLinks {
 

diff --git a/...v2/rooms/SendRoomNotificationRequest.java → ...v2/rooms/SendRoomNotificationRequest.java b/...v2/rooms/SendRoomNotificationRequest.java → ...v2/rooms/SendRoomNotificationRequest.java
@@ -1,7 +1,7 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
-import io.evanwong.hipchat.v2.commons.NoContent;
-import io.evanwong.hipchat.v2.commons.PostRequest;
+import io.evanwong.oss.hipchat.v2.commons.NoContent;
+import io.evanwong.oss.hipchat.v2.commons.PostRequest;
 import org.apache.http.client.HttpClient;
 
 import java.util.HashMap;

diff --git a/...s/SendRoomNotificationRequestBuilder.java → ...s/SendRoomNotificationRequestBuilder.java b/...s/SendRoomNotificationRequestBuilder.java → ...s/SendRoomNotificationRequestBuilder.java
@@ -1,6 +1,6 @@
-package io.evanwong.hipchat.v2.rooms;
+package io.evanwong.oss.hipchat.v2.rooms;
 
-import io.evanwong.hipchat.v2.commons.RequestBuilder;
+import io.evanwong.oss.hipchat.v2.commons.RequestBuilder;
 import org.apache.http.client.HttpClient;
 
 import java.util.concurrent.ExecutorService;

diff --git a/...nwong/hipchat/v2/HipChatClientSpec.groovy → ...g/oss/hipchat/v2/HipChatClientSpec.groovy b/...nwong/hipchat/v2/HipChatClientSpec.groovy → ...g/oss/hipchat/v2/HipChatClientSpec.groovy
@@ -1,7 +1,7 @@
-package io.evanwong.hipchat.v2
+package io.evanwong.oss.hipchat.v2
 
-import io.evanwong.hipchat.v2.rooms.MessageColor
-import io.evanwong.hipchat.v2.rooms.MessageFormat
+import io.evanwong.oss.hipchat.v2.rooms.MessageColor
+import io.evanwong.oss.hipchat.v2.rooms.MessageFormat
 import spock.lang.Specification
 
 class HipChatClientSpec extends Specification {