Author: bdelacretaz
Date: Fri Jan 22 17:22:24 2016
New Revision: 1726259
URL: http://svn.apache.org/viewvc?rev=1726259&view=rev
Log:
SLING-5449 - rename packages to repoinit
Added:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/
- copied from r1726242,
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/
- copied from r1726242,
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/
- copied from r1726242,
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/
- copied from r1726242,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/
- copied from r1726242,
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/acldef/
Removed:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/acldef/
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/acldef/
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/main/provisioning/model.txt
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/Retry.java
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
sling/trunk/contrib/extensions/repoinit/pom.xml
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/main/provisioning/model.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/main/provisioning/model.txt?rev=1726259&r1=1726258&r2=1726259&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/repoinit/it/src/main/provisioning/model.txt
(original)
+++ sling/trunk/contrib/extensions/repoinit/it/src/main/provisioning/model.txt
Fri Jan 22 17:22:24 2016
@@ -23,32 +23,32 @@
org.apache.sling/org.apache.sling.junit.core/1.0.14
org.apache.sling/org.apache.sling.testing.tools/1.0.10
- org.apache.sling/org.apache.sling.acldef.oak-jcr/0.0.1-SNAPSHOT
- org.apache.sling/org.apache.sling.acldef.parser/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.oak-jcr/0.0.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.repoinit.parser/0.0.1-SNAPSHOT
[settings]
org.apache.sling.commons.log.julenabled=true
[configurations]
-org.apache.sling.acldef.jcr.AclSetup-one
+org.apache.sling.repoinit.jcr.AclSetup-one
#
- acldef.text.1="create service user fredWilma"
+ repoinit.text.1="create service user fredWilma"
#
- # multiline acldef statement
- acldef.text.2="
+ # multiline repoinit statement
+ repoinit.text.2="
set ACL for fredWilma
allow jcr:all on /acltest
deny jcr:write on /acltest/A
end"
#
# single line with backslash n works as well
- acldef.text.backs="set ACL for fredWilma \n allow jcr:write on /acltest/A/B
\n end"
+ repoinit.text.backs="set ACL for fredWilma \n allow jcr:write on
/acltest/A/B \n end"
-# try some acldef in a separate config
-org.apache.sling.acldef.jcr.AclSetup-two
+# try some repoinit in a separate config
+org.apache.sling.repoinit.jcr.AclSetup-two
# this user will be created from code, to validate the async ACL setting
# and using the path-oriented notation, to test that
- acldef.text.another="
+ repoinit.text.another="
set ACL on /acltest
allow jcr:all for anotherUser
end
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java?rev=1726259&r1=1726258&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
Fri Jan 22 17:22:24 2016
@@ -27,6 +27,6 @@ public class ITCustomizer implements Tel
final ClientSideTeleporter cst = (ClientSideTeleporter)t;
cst.setBaseUrl(System.getProperty(BASE_URL_PROP, BASE_URL_PROP +
"_IS_NOT_SET"));
cst.setServerCredentials("admin", "admin");
- cst.includeDependencyPrefix("org.apache.sling.acldef.it");
+ cst.includeDependencyPrefix("org.apache.sling.repoinit.it");
}
}
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
Fri Jan 22 17:22:24 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.it;
+package org.apache.sling.repoinit.it;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -132,9 +132,9 @@ public class ProvisionedAclIT {
// to be set. Use a config to create the user,
// to also test that mechanism.
final ConfigurationAdmin ca =
teleporter.getService(ConfigurationAdmin.class);
- final Configuration cfg =
ca.createFactoryConfiguration("org.apache.sling.acldef.jcr.AclSetup");
+ final Configuration cfg =
ca.createFactoryConfiguration("org.apache.sling.repoinit.jcr.AclSetup");
final Dictionary<String, Object> props = new Hashtable<String,
Object>();
- props.put("acldef.text.1", "create service user " + ANOTHER);
+ props.put("repoinit.text.1", "create service user " + ANOTHER);
cfg.setBundleLocation(null);
cfg.update(props);
@@ -147,4 +147,4 @@ public class ProvisionedAclIT {
}
};
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/Retry.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/Retry.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/Retry.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/Retry.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.it;
+package org.apache.sling.repoinit.it;
import static org.junit.Assert.fail;
import java.util.concurrent.Callable;
@@ -52,4 +52,4 @@ public abstract class Retry implements C
fail("Failed with timeout:" + failure.toString());
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
Fri Jan 22 17:22:24 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.acldef.it;
+package org.apache.sling.repoinit.it;
import static org.junit.Assert.fail;
@@ -47,4 +47,4 @@ public class WaitFor {
}
fail("Timeout waiting for serviceClass " + serviceClass.getName());
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
Fri Jan 22 17:22:24 2016
@@ -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 impleme
setAcl(line, session, require(line, PROP_PRINCIPALS), paths,
require(line, PROP_PRIVILEGES), isAllow);
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclUtil.java
Fri Jan 22 17:22:24 2016
@@ -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;
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/ServiceUserUtil.java
Fri Jan 22 17:22:24 2016
@@ -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;
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/impl/AclSetup.java
Fri Jan 22 17:22:24 2016
@@ -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.
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.De
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 Runnabl
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 Runnabl
}
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
Fri Jan 22 17:22:24 2016
@@ -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.
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";
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
Fri Jan 22 17:22:24 2016
@@ -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;
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
Fri Jan 22 17:22:24 2016
@@ -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;
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
Fri Jan 22 17:22:24 2016
@@ -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;
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
Fri Jan 22 17:22:24 2016
@@ -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 */
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
Fri Jan 22 17:22:24 2016
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.acldef.parser;
+package org.apache.sling.repoinit.parser;
import java.io.Reader;
import java.util.List;
-import org.apache.sling.acldef.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.operations.Operation;
/** ACL definitions parser service interface */
public interface AclDefinitionsParser {
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
Fri Jan 22 17:22:24 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.acldef.parser;
+package org.apache.sling.repoinit.parser;
public class AclParsingException extends Exception {
private static final long serialVersionUID = 1L;
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
Fri Jan 22 17:22:24 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.acldef.parser.impl;
+package org.apache.sling.repoinit.parser.impl;
import java.io.IOException;
import java.io.Reader;
@@ -24,9 +24,9 @@ import java.util.List;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
-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.repoinit.parser.AclDefinitionsParser;
+import org.apache.sling.repoinit.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.operations.Operation;
/** ACL definitions parser service */
@Component
@@ -46,4 +46,4 @@ public class ACLDefinitionsParserService
}
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
import java.util.Collection;
import java.util.Collections;
@@ -40,4 +40,4 @@ import java.util.List;
public Collection<AclLine> getLines() {
return lines;
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
import java.util.ArrayList;
import java.util.Collections;
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
public class CreateServiceUser extends ServiceUserOperation {
public CreateServiceUser(String username) {
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
public class DeleteServiceUser extends ServiceUserOperation {
public DeleteServiceUser(String username) {
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
public abstract class Operation {
public abstract void accept(OperationVisitor v);
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
public interface OperationVisitor {
void visitCreateServiceUser(CreateServiceUser s);
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
public abstract class ServiceUserOperation extends Operation {
protected final String username;
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
import java.util.Collections;
import java.util.List;
@@ -47,4 +47,4 @@ public class SetAclPaths extends AclGrou
public void accept(OperationVisitor v) {
v.visitSetAclPaths(this);
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
import java.util.Collections;
import java.util.List;
@@ -47,4 +47,4 @@ public class SetAclPrincipals extends Ac
public void accept(OperationVisitor v) {
v.visitSetAclPrincipal(this);
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
Fri Jan 22 17:22:24 2016
@@ -16,6 +16,6 @@
******************************************************************************/
@Version("1.0.0")
-package org.apache.sling.acldef.parser.operations;
+package org.apache.sling.repoinit.parser.operations;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import aQute.bnd.annotation.Version;
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
Fri Jan 22 17:22:24 2016
@@ -16,6 +16,6 @@
******************************************************************************/
@Version("1.0.0")
-package org.apache.sling.acldef.parser;
+package org.apache.sling.repoinit.parser;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import aQute.bnd.annotation.Version;
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt?rev=1726259&r1=1726258&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
Fri Jan 22 17:22:24 2016
@@ -10,12 +10,12 @@ options
PARSER_BEGIN(ACLDefinitionsParserImpl)
-package org.apache.sling.acldef.parser.impl;
+package org.apache.sling.repoinit.parser.impl;
import java.util.List;
import java.util.ArrayList;
-import org.apache.sling.acldef.parser.operations.*;
+import org.apache.sling.repoinit.parser.operations.*;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -242,4 +242,4 @@ void setAclPrincipals(List<Operation> re
{
result.add(new SetAclPrincipals(principals, lines));
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
Fri Jan 22 17:22:24 2016
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.test;
+package org.apache.sling.repoinit.parser.test;
import java.io.PrintWriter;
import java.util.Collection;
-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;
/** OperationVisitor that dumps the operations using
* their toString() methods
@@ -78,4 +78,4 @@ class OperationToStringVisitor implement
out.println(line);
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
Fri Jan 22 17:22:24 2016
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.test;
+package org.apache.sling.repoinit.parser.test;
import java.io.Reader;
import java.io.StringReader;
-import org.apache.sling.acldef.parser.AclParsingException;
-import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserService;
+import org.apache.sling.repoinit.parser.AclParsingException;
+import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserService;
import org.junit.Test;
public class ParserServiceTest {
@@ -36,4 +36,4 @@ public class ParserServiceTest {
final Reader r = new StringReader("not a valid statement");
new ACLDefinitionsParserService().parse(r);
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.test;
+package org.apache.sling.repoinit.parser.test;
import static org.junit.Assert.assertEquals;
@@ -28,10 +28,10 @@ import java.util.Collection;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserImpl;
-import org.apache.sling.acldef.parser.impl.ParseException;
-import org.apache.sling.acldef.parser.operations.Operation;
-import org.apache.sling.acldef.parser.operations.OperationVisitor;
+import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserImpl;
+import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.operations.OperationVisitor;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -122,4 +122,4 @@ public class ParserTest {
tc.close();
}
}
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java?rev=1726259&r1=1726242&r2=1726259&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
Fri Jan 22 17:22:24 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.acldef.parser.test;
+package org.apache.sling.repoinit.parser.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserImpl;
-import org.apache.sling.acldef.parser.impl.ParseException;
-import org.apache.sling.acldef.parser.impl.TokenMgrError;
+import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserImpl;
+import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.apache.sling.repoinit.parser.impl.TokenMgrError;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -86,4 +86,4 @@ public class ParsingErrorsTest {
r.close();
}
}
-}
\ No newline at end of file
+}
Modified: sling/trunk/contrib/extensions/repoinit/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/pom.xml?rev=1726259&r1=1726258&r2=1726259&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/repoinit/pom.xml (original)
+++ sling/trunk/contrib/extensions/repoinit/pom.xml Fri Jan 22 17:22:24 2016
@@ -30,7 +30,7 @@
<artifactId>org.apache.sling.repoinit.reactor</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Apache Sling Content RepoInit Reactor</name>
+ <name>Apache Sling RepoInit Reactor</name>
<description>Content Repository Initialization Modules</description>
<modules>
