[Amdatu-commits] SVN r759 - in trunk/amdatu-authorization/useradmin-rest: . src/main/java/org/amdatu/authorization/useradmin/rest/bean

[subvers...@amdatu.org]

Author: marcel.offermans at luminis.nl
Date: Thu Feb  3 12:44:00 2011
New Revision: 759

Log:
AMDATU-261 Now also handles spaces in user names.

Modified:
   trunk/amdatu-authorization/useradmin-rest/pom.xml
   
trunk/amdatu-authorization/useradmin-rest/src/main/java/org/amdatu/authorization/useradmin/rest/bean/RoleBean.java

Modified: trunk/amdatu-authorization/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-authorization/useradmin-rest/pom.xml   (original)
+++ trunk/amdatu-authorization/useradmin-rest/pom.xml   Thu Feb  3 12:44:00 2011
@@ -40,6 +40,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.wink</groupId>
+      <artifactId>wink-assembly-aggregatejar-osgi</artifactId>
+      <version>${org.apache.wink.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.amdatu.authentication</groupId>
       <artifactId>tokenprovider</artifactId>
       <version>${platform.version}</version>
@@ -56,8 +62,11 @@
         <configuration>
           <instructions>
             
<Bundle-Activator>org.amdatu.authorization.useradmin.rest.osgi.Activator</Bundle-Activator>
-            <Bundle-SymbolicName> 
org.amdatu.authorization.useradmin.rest</Bundle-SymbolicName>
-            <Embed-Dependency>*;scope=compile</Embed-Dependency>
+            
<Bundle-SymbolicName>org.amdatu.authorization.useradmin.rest</Bundle-SymbolicName>
+            
<Private-Package>org.amdatu.authorization.useradmin.rest.*,org.apache.wink.common.internal.uri</Private-Package>
+            <Embed-Dependency>json,utilities;scope=compile</Embed-Dependency>
+                       <Export-Package>!*</Export-Package>
+                       
<Import-Package>!org.apache.wink.common.internal.*,*</Import-Package>
           </instructions>
         </configuration>
       </plugin>   

Modified: 
trunk/amdatu-authorization/useradmin-rest/src/main/java/org/amdatu/authorization/useradmin/rest/bean/RoleBean.java
==============================================================================
--- 
trunk/amdatu-authorization/useradmin-rest/src/main/java/org/amdatu/authorization/useradmin/rest/bean/RoleBean.java
  (original)
+++ 
trunk/amdatu-authorization/useradmin-rest/src/main/java/org/amdatu/authorization/useradmin/rest/bean/RoleBean.java
  Thu Feb  3 12:44:00 2011
@@ -16,9 +16,7 @@
  */
 package org.amdatu.authorization.useradmin.rest.bean;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +28,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
+import org.apache.wink.common.internal.uri.UriEncoder;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
@@ -122,12 +121,7 @@
     }
     
     private static String encode(String name) {
-       try {
-               return URLEncoder.encode(name, "UTF-8");
-       }
-       catch (UnsupportedEncodingException e) {
-               throw new IllegalStateException("UTF-8 must be supported by the 
JVM");
-       }
+               return UriEncoder.encodeString(name);
     }
 
     public static RoleBean fromRole(Role role, UserAdmin userAdmin, boolean 
loadMembers) throws URISyntaxException {