This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.repoinit-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit 8296d7d473f55c39858dff0c46ad1c734ce7dad0
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Fri Jan 22 17:22:24 2016 +0000
SLING-5449 - rename packages to repoinit
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/repoinit/oak-jcr@1726259
13f79535-47bb-0310-9956-ffa450edef68
---
.../jcr/AclOperationVisitor.java | 22 +++++++++++-----------
.../sling/{acldef => repoinit}/jcr/AclUtil.java | 2 +-
.../{acldef => repoinit}/jcr/ServiceUserUtil.java | 2 +-
.../{acldef => repoinit}/jcr/impl/AclSetup.java | 22 +++++++++++-----------
.../jcr/webconsole/OakAclDefConsolePlugin.java | 16 ++++++++--------
.../jcr/CreateServiceUsersTest.java | 2 +-
.../{acldef => repoinit}/jcr/GeneralAclTest.java | 4 ++--
.../jcr/NonExistentPathTest.java | 4 ++--
.../sling/{acldef => repoinit}/jcr/TestUtil.java | 8 ++++----
9 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
b/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
similarity index 85%
rename from src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
rename to src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
index 19d43f8..6403e65 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
+++ b/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
-import static org.apache.sling.acldef.parser.operations.AclLine.PROP_PATHS;
-import static
org.apache.sling.acldef.parser.operations.AclLine.PROP_PRINCIPALS;
-import static
org.apache.sling.acldef.parser.operations.AclLine.PROP_PRIVILEGES;
+import static org.apache.sling.repoinit.parser.operations.AclLine.PROP_PATHS;
+import static
org.apache.sling.repoinit.parser.operations.AclLine.PROP_PRINCIPALS;
+import static
org.apache.sling.repoinit.parser.operations.AclLine.PROP_PRIVILEGES;
import java.util.List;
import javax.jcr.Session;
-import org.apache.sling.acldef.parser.operations.AclLine;
-import org.apache.sling.acldef.parser.operations.CreateServiceUser;
-import org.apache.sling.acldef.parser.operations.DeleteServiceUser;
-import org.apache.sling.acldef.parser.operations.OperationVisitor;
-import org.apache.sling.acldef.parser.operations.SetAclPaths;
-import org.apache.sling.acldef.parser.operations.SetAclPrincipals;
+import org.apache.sling.repoinit.parser.operations.AclLine;
+import org.apache.sling.repoinit.parser.operations.CreateServiceUser;
+import org.apache.sling.repoinit.parser.operations.DeleteServiceUser;
+import org.apache.sling.repoinit.parser.operations.OperationVisitor;
+import org.apache.sling.repoinit.parser.operations.SetAclPaths;
+import org.apache.sling.repoinit.parser.operations.SetAclPrincipals;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,4 +114,4 @@ public class AclOperationVisitor implements
OperationVisitor {
setAcl(line, session, require(line, PROP_PRINCIPALS), paths,
require(line, PROP_PRIVILEGES), isAllow);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java
b/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
similarity index 98%
rename from src/main/java/org/apache/sling/acldef/jcr/AclUtil.java
rename to src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
index 97f79ac..10a7967 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java
+++ b/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import java.security.Principal;
import java.util.List;
diff --git a/src/main/java/org/apache/sling/acldef/jcr/ServiceUserUtil.java
b/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
similarity index 98%
rename from src/main/java/org/apache/sling/acldef/jcr/ServiceUserUtil.java
rename to src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
index 2d131ce..65fa155 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/ServiceUserUtil.java
+++ b/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
diff --git a/src/main/java/org/apache/sling/acldef/jcr/impl/AclSetup.java
b/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
similarity index 89%
rename from src/main/java/org/apache/sling/acldef/jcr/impl/AclSetup.java
rename to src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
index fd711b2..9bb2606 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/impl/AclSetup.java
+++ b/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr.impl;
+package org.apache.sling.repoinit.jcr.impl;
import java.io.StringReader;
import java.util.ArrayList;
@@ -27,9 +27,9 @@ import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.sling.acldef.jcr.AclOperationVisitor;
-import org.apache.sling.acldef.parser.AclDefinitionsParser;
-import org.apache.sling.acldef.parser.operations.Operation;
+import org.apache.sling.repoinit.jcr.AclOperationVisitor;
+import org.apache.sling.repoinit.parser.AclDefinitionsParser;
+import org.apache.sling.repoinit.parser.operations.Operation;
import org.apache.sling.commons.threads.ThreadPool;
import org.apache.sling.commons.threads.ThreadPoolManager;
import org.apache.sling.jcr.api.SlingRepository;
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
import aQute.bnd.annotation.component.Deactivate;
/** OSGi component that sets up service users and ACLS
- * based on configurations created by the acldef provisioning
+ * based on configurations created by the repoinit provisioning
* model processor.
*
* As Oak requires a path to exist before setting an ACL on it,
@@ -53,8 +53,8 @@ import aQute.bnd.annotation.component.Deactivate;
policy=ConfigurationPolicy.REQUIRE)
public class AclSetup implements Runnable {
private final Logger log = LoggerFactory.getLogger(getClass());
- public static final String CONFIG_PID =
"org.apache.sling.acldef.jcr.AclSetup";
- public static final String ACLDEF_PROP_PREFIX = "acldef.text.";
+ public static final String CONFIG_PID =
"org.apache.sling.repoinit.jcr.AclSetup";
+ public static final String ACLDEF_PROP_PREFIX = "repoinit.text.";
public static final String THREAD_POOL_NAME = "ACL Definitions";
private List<String> todo;
@@ -114,15 +114,15 @@ public class AclSetup implements Runnable {
try {
s = repository.loginAdministrative(null);
final AclOperationVisitor visitor = new AclOperationVisitor(s);
- for(String acldef : todo) {
+ for(String repoinit : todo) {
try {
- for(Operation op : parser.parse(new StringReader(acldef)))
{
+ for(Operation op : parser.parse(new
StringReader(repoinit))) {
op.accept(visitor);
s.save();
}
} catch(Exception e) {
log.warn("Exception while executing an ACL definition:" +
e.toString(), e);
- newTodo.add(acldef);
+ newTodo.add(repoinit);
}
}
} catch(Exception e) {
@@ -151,4 +151,4 @@ public class AclSetup implements Runnable {
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
b/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
similarity index 94%
rename from
src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
rename to
src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
index 5421c04..464f5b0 100644
---
a/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
+++
b/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.acldef.jcr.webconsole;
+package org.apache.sling.repoinit.jcr.webconsole;
import java.io.IOException;
import java.io.PrintWriter;
@@ -40,11 +40,11 @@ import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.acldef.jcr.AclOperationVisitor;
-import org.apache.sling.acldef.parser.AclDefinitionsParser;
-import org.apache.sling.acldef.parser.AclParsingException;
-import org.apache.sling.acldef.parser.operations.Operation;
-import org.apache.sling.acldef.parser.operations.OperationVisitor;
+import org.apache.sling.repoinit.jcr.AclOperationVisitor;
+import org.apache.sling.repoinit.parser.AclDefinitionsParser;
+import org.apache.sling.repoinit.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.operations.OperationVisitor;
import org.apache.sling.api.request.ResponseUtil;
import org.apache.sling.jcr.api.SlingRepository;
import org.osgi.framework.Constants;
@@ -56,13 +56,13 @@ import org.osgi.framework.Constants;
@Property(name=Constants.SERVICE_DESCRIPTION, value="Apache Sling ACL
Definitions Console Plugin"),
@Property(name="felix.webconsole.label",
value=OakAclDefConsolePlugin.LABEL),
@Property(name="felix.webconsole.title", value="Set ACLs"),
- @Property(name="felix.webconsole.css", value="/" +
OakAclDefConsolePlugin.LABEL + "/res/ui/acldef.css"),
+ @Property(name="felix.webconsole.css", value="/" +
OakAclDefConsolePlugin.LABEL + "/res/ui/repoinit.css"),
@Property(name="felix.webconsole.category", value="Sling"),
})
public class OakAclDefConsolePlugin extends HttpServlet {
private static final long serialVersionUID = 1234;
- private static final String PAR_ACLDEF = "acldef";
+ private static final String PAR_ACLDEF = "repoinit";
private static final String PAR_MSG = "msg";
public static final String LABEL = "setACL";
private static final String ATTR_SUBMIT = "plugin.submit";
diff --git
a/src/test/java/org/apache/sling/acldef/jcr/CreateServiceUsersTest.java
b/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
similarity index 98%
rename from
src/test/java/org/apache/sling/acldef/jcr/CreateServiceUsersTest.java
rename to
src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
index 23e4174..db31485 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/CreateServiceUsersTest.java
+++ b/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import java.util.Random;
diff --git a/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
b/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
similarity index 97%
rename from src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
rename to src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
index 1b85e0d..5634a21 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
+++ b/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -26,7 +26,7 @@ import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.acldef.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.AclParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
diff --git a/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
b/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
similarity index 95%
rename from src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
rename to src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
index f74fbe8..9e20ea0 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
+++ b/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -23,7 +23,7 @@ import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.acldef.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.AclParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
diff --git a/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
b/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
similarity index 93%
rename from src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
rename to src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
index 03782e2..612e699 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
+++ b/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.jcr;
+package org.apache.sling.repoinit.jcr;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -31,9 +31,9 @@ import javax.jcr.SimpleCredentials;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
-import org.apache.sling.acldef.parser.AclParsingException;
-import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserService;
-import org.apache.sling.acldef.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserService;
+import org.apache.sling.repoinit.parser.operations.Operation;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
/** Test utilities */
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
