sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-jcr-contentloader] 12/36: SLING-981 Corrected trailing white space introduced by previous commit.
Date Tue, 07 Nov 2017 09:47:15 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.contentloader-2.0.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git

commit a0c672e991d02df60f67939323eef846b4e2faa7
Author: Ian Boston <ieb@apache.org>
AuthorDate: Thu Jul 16 11:34:10 2009 +0000

    SLING-981
    Corrected trailing white space introduced by previous commit.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader@794636
13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/jcr/contentloader/internal/ContentCreator.java     | 12 ++++++------
 .../jcr/contentloader/internal/ContentLoaderService.java     | 10 +++++-----
 .../jcr/contentloader/internal/DefaultContentCreator.java    | 10 +++++-----
 .../sling/jcr/contentloader/internal/readers/JsonReader.java | 10 +++++-----
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
index 5f10d6a..6d25b51 100644
--- a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
+++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
@@ -133,8 +133,8 @@ public interface ContentCreator {
      */
     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 @@ public interface ContentCreator {
      */
     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 @@ public interface ContentCreator {
      */
     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)
diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
index cfa09e0..0ce1039 100644
--- a/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
+++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderService.java
@@ -73,13 +73,13 @@ public class ContentLoaderService implements SynchronousBundleListener
{
     /**
      * 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 @@ public class ContentLoaderService implements SynchronousBundleListener
{
 
     /**
      * 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 @@ public class ContentLoaderService implements SynchronousBundleListener
{
             throw new IllegalArgumentException(e.toString());
         }
     }
-    
+   
     // ---------- SCR Integration ---------------------------------------------
 
     /** Activates this component, called by SCR before registering as a service */
@@ -247,7 +247,7 @@ public class ContentLoaderService implements SynchronousBundleListener
{
         } else {
             passwordDigestAlgoritm = DEFAULT_PASSWORD_DIGEST_ALGORITHM;
         }
-        
+       
         Session session = null;
         try {
             session = this.getSession();
diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
b/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
index 424a189..c6f8785 100644
--- a/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
+++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
@@ -98,12 +98,12 @@ public class DefaultContentCreator implements ContentCreator {
      * 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 @@ public class DefaultContentCreator implements ContentCreator {
         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 @@ public class DefaultContentCreator implements ContentCreator {
 				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);
diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
b/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
index 3184b3a..75a9802 100644
--- a/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
+++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
@@ -324,8 +324,8 @@ public class JsonReader implements ContentReader {
      *      		"jcr:read",
      *      		"jcr:write"
      *     		]
-     *     	}    
-     *   ]    
+     *     	}   
+     *   ]   
      *  }
      *  </code>
      */
@@ -347,7 +347,7 @@ public class JsonReader implements ContentReader {
     		}
     	}
     }
-    
+   
     /**
      * Create or update an access control entry
      */
@@ -375,6 +375,6 @@ public class JsonReader implements ContentReader {
 		
 		//do the work.
 		contentCreator.createAce(principalID, grantedPrivileges, deniedPrivileges);
-    }    
-    
+    }   
+   
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message