Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Java

Layoric · Layoric · commit d2286e47ed1d · 2015-04-22T07:48:24.000+10:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.android;
 
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.android;
 
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.android;
 
 import android.graphics.Bitmap;
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.client;
 
 import java.lang.reflect.Type;
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Func.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Func.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.client;
 
 import com.android.internal.util.Predicate;
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.client;
 
 public class Log {
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.client;
 
 public class LogProvider {
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java
@@ -1,3 +1,6 @@
+//  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
+
 package net.servicestack.client;
 
 /**
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
+//  License: https://servicestack.net/bsd-license.txt
 
 package net.servicestack.client;
 
diff --git a/src/AndroidClient/techstacks/src/main/java/servicestack/net/techstacks/MainActivity.java b/src/AndroidClient/techstacks/src/main/java/servicestack/net/techstacks/MainActivity.java
@@ -28,7 +28,7 @@
 
 import java.util.ArrayList;
 
-import servicestack.net.techstacks.dto.Option;
+import servicestack.net.techstacks.dto.*;
 import servicestack.net.techstacks.dto.Technology;
 import servicestack.net.techstacks.dto.TechnologyInfo;
 import servicestack.net.techstacks.dto.TechnologyStack;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// Copyright (c) 2015 ServiceStack LLC. All rights reserved.`
	`2`	`+// License: https://servicestack.net/bsd-license.txt`
`2`	`3`
`3`	`4`	`package net.servicestack.android;`
`4`	`5`