incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r794636 - in /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal: ContentCreator.java ContentLoaderService.java DefaultContentCreator.java readers/JsonReader.java
Date Thu, 16 Jul 2009 11:34:10 GMT
Author: ieb
Date: Thu Jul 16 11:34:10 2009
New Revision: 794636

URL: http://svn.apache.org/viewvc?rev=794636&view=rev
Log:
SLING-981
Corrected trailing white space introduced by previous commit.

Modified:
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java?rev=794636&r1=794635&r2=794636&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
Thu Jul 16 11:34:10 2009
@@ -133,8 +133,8 @@
      */
     boolean switchCurrentNode(String subPath, String newNodeType)
     throws RepositoryException;
-    
-    
+   
+   
     /**
      * Create a User in the jackrabbit UserManager
      * @param name the name of the user
@@ -144,7 +144,7 @@
      */
     void createUser(String name, String password, Map<String, Object> extraProperties)
     throws RepositoryException;
-    
+   
     /**
      * Create a Group in the jackrabbit UserManager
      * @param name the name of the group
@@ -154,11 +154,11 @@
      */
     void createGroup(String name, String[] members, Map<String, Object> extraProperties)
     throws RepositoryException;
-    
+   
     /**
-     * Creates an Access Control Entry for the current node for the specified 
+     * Creates an Access Control Entry for the current node for the specified
      *  principal and privileges.
-     * 
+     *
      * @param principal the user or group id for the ACE
      * @param grantedPrivileges the set of privileges to grant the principal
      * @param deniedPrivileges the set of privileges to deny the principal (for users only)

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java?rev=794636&r1=794635&r2=794636&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
Thu Jul 16 11:34:10 2009
@@ -73,13 +73,13 @@
     /**
      * To be used for the encryption. E.g. for passwords in
      * {@link javax.jcr.SimpleCredentials#getPassword()} SimpleCredentials}
-     * 
+     *
      * @scr.property valueRef="DEFAULT_PASSWORD_DIGEST_ALGORITHM"
      */
     private static final String PROP_PASSWORD_DIGEST_ALGORITHM = "password.digest.algorithm";
     private static final String DEFAULT_PASSWORD_DIGEST_ALGORITHM = "sha1";
     private String passwordDigestAlgoritm = null;
-    
+   
     /** default log */
     final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -212,7 +212,7 @@
 
     /**
      * Digest the given password using the configured digest algorithm
-     * 
+     *
      * @param pwd the value to digest
      * @return the digested value
      * @throws IllegalArgumentException
@@ -230,7 +230,7 @@
             throw new IllegalArgumentException(e.toString());
         }
     }
-    
+   
     // ---------- SCR Integration ---------------------------------------------
 
     /** Activates this component, called by SCR before registering as a service */
@@ -247,7 +247,7 @@
         } else {
             passwordDigestAlgoritm = DEFAULT_PASSWORD_DIGEST_ALGORITHM;
         }
-        
+       
         Session session = null;
         try {
             session = this.getSession();

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java?rev=794636&r1=794635&r2=794636&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
Thu Jul 16 11:34:10 2009
@@ -98,12 +98,12 @@
      * A one time use seed to randomize the user location.
      */
     private static final long INSTANCE_SEED = System.currentTimeMillis();
-    
+   
     /**
      * The number of levels folder used to store a user, could be a configuration option.
      */
     private static final int STORAGE_LEVELS = 3;
-    
+   
     /**
      * Constructor.
      * @param jcrContentHelper Helper class to get the mime type of a file
@@ -697,8 +697,8 @@
         if (authorizable == null) {
             //principal does not exist yet, so create it
         	String digestedPassword = jcrContentHelper.digestPassword(password);
-        	User user = userManager.createUser(name, 
-        			digestedPassword, 
+        	User user = userManager.createUser(name,
+        			digestedPassword,
         			new Principal() {
 						public String getName() {
 							return name;
@@ -800,7 +800,7 @@
 				for (Privilege privilege : privileges) {
 					String privilegeName = privilege.getName();
 					if (!postedPrivilegeNames.contains(privilegeName)) {
-						//this privilege was not posted, so record the existing state to be 
+						//this privilege was not posted, so record the existing state to be
 						// preserved when the ACE is re-created below
 						if (isAllow) {
 							preserveGrantedPrivileges.add(privilege);

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java?rev=794636&r1=794635&r2=794636&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
Thu Jul 16 11:34:10 2009
@@ -324,8 +324,8 @@
      *      		"jcr:read",
      *      		"jcr:write"
      *     		]
-     *     	}    
-     *   ]    
+     *     	}   
+     *   ]   
      *  }
      *  </code>
      */
@@ -347,7 +347,7 @@
     		}
     	}
     }
-    
+   
     /**
      * Create or update an access control entry
      */
@@ -375,6 +375,6 @@
 		
 		//do the work.
 		contentCreator.createAce(principalID, grantedPrivileges, deniedPrivileges);
-    }    
-    
+    }   
+   
 }



Mime
View raw message