olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject olingo-odata4 git commit: [OLINGO-649] Fixed compile errors after beta-03
Date Tue, 26 May 2015 11:20:30 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/master db47760e3 -> 0c511f80b


[OLINGO-649] Fixed compile errors after beta-03


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0c511f80
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0c511f80
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0c511f80

Branch: refs/heads/master
Commit: 0c511f80b2f245d1faf96d5bbe1d467b96b85fdf
Parents: db47760
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Tue May 26 13:20:16 2015 +0200
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Tue May 26 13:20:16 2015 +0200

----------------------------------------------------------------------
 pom.xml                                                      | 1 +
 samples/client/pom.xml                                       | 8 ++++++++
 .../samples/client/core/http/CookieHttpClientFactory.java    | 2 +-
 .../client/core/http/CustomConnectionsHttpClientFactory.java | 2 +-
 .../client/core/http/ParametersHttpClientFactory.java        | 2 +-
 .../client/core/http/ParametersHttpUriRequestFactory.java    | 2 +-
 .../core/http/ProtocolInterceptorHttpClientFactory.java      | 2 +-
 .../client/core/http/RequestRetryHttpClientFactory.java      | 2 +-
 .../client/core/http/SocketFactoryHttpClientFactory.java     | 2 +-
 .../samples/client/core/http/StatefulHttpClientFactory.java  | 2 +-
 10 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 235f30f..b70c756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -565,6 +565,7 @@
                 <exclude>**/nb-configuration.xml</exclude>
                 <exclude>**/.externalToolBuilders/**</exclude>
                 <exclude>**/maven-eclipse.xml</exclude>
+                <exclude>**/*.iml</exclude>
                 <exclude>**/ref/**</exclude>
                 <exclude>**/server-ref/**</exclude>
                 <exclude>**/dependency-reduced-pom.xml</exclude>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/client/pom.xml b/samples/client/pom.xml
index 117735a..b55a1ae 100644
--- a/samples/client/pom.xml
+++ b/samples/client/pom.xml
@@ -44,6 +44,14 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+
+      <!-- Disable checkstyle for sample -->
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CookieHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CookieHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CookieHttpClientFactory.java
index 4857b11..2069dfb 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CookieHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CookieHttpClientFactory.java
@@ -23,7 +23,7 @@ import org.apache.http.client.CookieStore;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CustomConnectionsHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CustomConnectionsHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CustomConnectionsHttpClientFactory.java
index 8975678..0810ffe 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CustomConnectionsHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/CustomConnectionsHttpClientFactory.java
@@ -39,7 +39,7 @@ import org.apache.http.message.BasicLineParser;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpClientFactory.java
index bdee1d0..cd94ce6 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpClientFactory.java
@@ -23,7 +23,7 @@ import org.apache.http.HttpVersion;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpUriRequestFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpUriRequestFactory.java
index 9ba0746..cbf0898 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpUriRequestFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ParametersHttpUriRequestFactory.java
@@ -23,7 +23,7 @@ import org.apache.http.HttpVersion;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ProtocolInterceptorHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ProtocolInterceptorHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ProtocolInterceptorHttpClientFactory.java
index 72beab9..cac1227 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ProtocolInterceptorHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/ProtocolInterceptorHttpClientFactory.java
@@ -27,7 +27,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.protocol.HttpContext;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/RequestRetryHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/RequestRetryHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/RequestRetryHttpClientFactory.java
index e39e07b..47a287c 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/RequestRetryHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/RequestRetryHttpClientFactory.java
@@ -30,7 +30,7 @@ import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/SocketFactoryHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/SocketFactoryHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/SocketFactoryHttpClientFactory.java
index 1d41005..65521e1 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/SocketFactoryHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/SocketFactoryHttpClientFactory.java
@@ -28,7 +28,7 @@ import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.BasicClientConnectionManager;
 import org.apache.http.params.CoreProtocolPNames;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
 import org.apache.olingo.commons.api.ODataRuntimeException;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0c511f80/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/StatefulHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/StatefulHttpClientFactory.java
b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/StatefulHttpClientFactory.java
index 4d69abd..f8fb21a 100644
--- a/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/StatefulHttpClientFactory.java
+++ b/samples/client/src/main/java/org/apache/olingo/samples/client/core/http/StatefulHttpClientFactory.java
@@ -22,7 +22,7 @@ import java.net.URI;
 import org.apache.http.client.UserTokenHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.protocol.HttpContext;
-import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.http.HttpMethod;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 
 /**


Mime
View raw message