marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [1/4] marmotta git commit: MARMOTTA-534: temporally removed the users' uri resolution for fixing the multiple web service resolution issue
Date Wed, 10 May 2017 08:11:44 GMT
Repository: marmotta
Updated Branches:
  refs/heads/MARMOTTA-534_fix_login [created] 8718475c8


MARMOTTA-534: temporally removed the users' uri resolution for fixing the multiple web service
resolution issue


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2b2a803e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2b2a803e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2b2a803e

Branch: refs/heads/MARMOTTA-534_fix_login
Commit: 2b2a803ede39f17fb60b1c1a91edad467090eadd
Parents: f7b3350
Author: Sergio Fernández <wikier@apache.org>
Authored: Wed May 10 08:35:53 2017 +0200
Committer: Sergio Fernández <wikier@apache.org>
Committed: Wed May 10 08:48:17 2017 +0200

----------------------------------------------------------------------
 .../marmotta/platform/user/webservices/UserWebService.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b2a803e/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
index a83ed36..730b54c 100644
--- a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
+++ b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
@@ -233,8 +233,8 @@ public class UserWebService {
      * @HTTP 400 if no valid resource uri could be built with the login
      * @HTTP 500 on other exceptions
      */
-    @GET
-    @Path("/{login:[^#?]+}")
+    //@GET
+    //@Path("/{login:[^#?]+}")
     public Response getUser(@PathParam("login") String login, @HeaderParam("Accept") String
types) {
         if(login.equals("me")) {
             return get();
@@ -301,7 +301,7 @@ public class UserWebService {
      *
      */
     static class AccountPoJo {
-        private String              login, uri, roles[];
+        private String login, uri, roles[];
         private Map<String, String> foaf;
 
         public AccountPoJo(String login, String uri) {
@@ -346,5 +346,7 @@ public class UserWebService {
         public Map<String, String> getFoaf() {
             return foaf;
         }
+
     }
+
 }


Mime
View raw message