[Yanel-commits] rev 40390 - public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2008-12-09 16:26:17 +0100 (Tue, 09 Dec 2008)
New Revision: 40390

Modified:
   public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
Log:
obsolete imports removed and not used method commented

Modified: public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2008-12-09 15:24:41 UTC (rev 40389)
+++ public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2008-12-09 15:26:17 UTC (rev 40390)
@@ -37,11 +37,6 @@
 import org.wyona.security.core.api.Group;
 import org.wyona.security.core.api.AccessManagementException;
 import org.wyona.yarep.core.Repository;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-
 import org.apache.log4j.Category;
 
 import javax.xml.transform.Transformer;
@@ -240,9 +235,8 @@
     public String getPropertyType(String propertyName) {
         if (propertyName.equals("password") || propertyName.equals("passwordConfirmed")) {
             return CreatableV2.TYPE_PASSWORD;
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -299,9 +293,8 @@
     public String getCreateName(String suggestedName) {
         if (suggestedName != null && suggestedName.equals("")) {
             return null;
-        } else {
-            return suggestedName;
         }
+        return suggestedName;
     }
 
     /**
@@ -329,69 +322,69 @@
         return property;
     }
 
-    /**
-     * Create a configuration object with the policies to access the user data.
-     * Only the user and lenya will be able to access the user data.
-     *
-     * @param userId
-     *            The user who must be granted permission to modify data
-     * @return Configuration object containing the corresponding policies
-     */
-    private Configuration createPolicyConfiguration(String userId) {
-        DefaultConfiguration config = new DefaultConfiguration(POLICY);
-        config.setAttribute(XMLNS_ATTR, XMLNS);
+//    /**
+//     * Create a configuration object with the policies to access the user data.
+//     * Only the user and lenya will be able to access the user data.
+//     *
+//     * @param userId
+//     *            The user who must be granted permission to modify data
+//     * @return Configuration object containing the corresponding policies
+//     */
+//    private Configuration createPolicyConfiguration(String userId) {
+//        DefaultConfiguration config = new DefaultConfiguration(POLICY);
+//        config.setAttribute(XMLNS_ATTR, XMLNS);
+//
+//        DefaultConfiguration child = null;
+//
+//        child = new DefaultConfiguration(ROLE);
+//        child.setAttribute(ID_ATTR, "view");
+//        config.addChild(child);
+//
+//        DefaultConfiguration worldNode = new DefaultConfiguration(WORLD);
+//        worldNode.setAttribute(PERMISSION_ATTR, "false");
+//        child.addChild(worldNode);
+//
+//        DefaultConfiguration userNode = new DefaultConfiguration(GROUP);
+//        userNode.setAttribute(ID_ATTR, "admin");
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        userNode = new DefaultConfiguration(USER);
+//        userNode.setAttribute(ID_ATTR, userId);
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        child = new DefaultConfiguration(ROLE);
+//        child.setAttribute(ID_ATTR, "open");
+//        config.addChild(child);
+//
+//        userNode = new DefaultConfiguration(GROUP);
+//        userNode.setAttribute(ID_ATTR, "admin");
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        userNode = new DefaultConfiguration(USER);
+//        userNode.setAttribute(ID_ATTR, userId);
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        child = new DefaultConfiguration(ROLE);
+//        child.setAttribute(ID_ATTR, "write");
+//        config.addChild(child);
+//
+//        userNode = new DefaultConfiguration(GROUP);
+//        userNode.setAttribute(ID_ATTR, "admin");
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        userNode = new DefaultConfiguration(USER);
+//        userNode.setAttribute(ID_ATTR, userId);
+//        userNode.setAttribute(PERMISSION_ATTR, "true");
+//        child.addChild(userNode);
+//
+//        return config;
+//    }
 
-        DefaultConfiguration child = null;
-
-        child = new DefaultConfiguration(ROLE);
-        child.setAttribute(ID_ATTR, "view");
-        config.addChild(child);
-
-        DefaultConfiguration worldNode = new DefaultConfiguration(WORLD);
-        worldNode.setAttribute(PERMISSION_ATTR, "false");
-        child.addChild(worldNode);
-
-        DefaultConfiguration userNode = new DefaultConfiguration(GROUP);
-        userNode.setAttribute(ID_ATTR, "admin");
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, userId);
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        child = new DefaultConfiguration(ROLE);
-        child.setAttribute(ID_ATTR, "open");
-        config.addChild(child);
-
-        userNode = new DefaultConfiguration(GROUP);
-        userNode.setAttribute(ID_ATTR, "admin");
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, userId);
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        child = new DefaultConfiguration(ROLE);
-        child.setAttribute(ID_ATTR, "write");
-        config.addChild(child);
-
-        userNode = new DefaultConfiguration(GROUP);
-        userNode.setAttribute(ID_ATTR, "admin");
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, userId);
-        userNode.setAttribute(PERMISSION_ATTR, "true");
-        child.addChild(userNode);
-
-        return config;
-    }
-
     /**
      * Updates the user profile
      *