You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:49:22 UTC
[sling-org-apache-sling-jcr-repoinit] 39/43: SLING-5819 - rename
repoinit.jcr package to jcr.repoinit
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 92c425453de8ea2a41b4c7a74f2e3210dccca9ac
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Jul 4 12:21:03 2016 +0000
SLING-5819 - rename repoinit.jcr package to jcr.repoinit
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/jcr@1751260 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/{repoinit/jcr => jcr/repoinit}/JcrRepoInitOpsProcessor.java | 2 +-
.../org/apache/sling/{repoinit/jcr => jcr/repoinit}/impl/AclUtil.java | 2 +-
.../jcr => jcr/repoinit}/impl/JcrRepoInitOperationVisitor.java | 2 +-
.../jcr => jcr/repoinit}/impl/JcrRepoInitOpsProcessorImpl.java | 4 ++--
.../{repoinit/jcr => jcr/repoinit}/impl/RepositoryInitializer.java | 4 ++--
.../sling/{repoinit/jcr => jcr/repoinit}/impl/ServiceUserUtil.java | 2 +-
.../org/apache/sling/{repoinit/jcr => jcr/repoinit}/package-info.java | 2 +-
.../apache/sling/{repoinit/jcr => jcr/repoinit}/CreatePathsTest.java | 4 ++--
.../sling/{repoinit/jcr => jcr/repoinit}/CreateServiceUsersTest.java | 4 ++--
.../apache/sling/{repoinit/jcr => jcr/repoinit}/GeneralAclTest.java | 4 ++--
.../sling/{repoinit/jcr => jcr/repoinit}/NonExistentPathTest.java | 4 ++--
.../apache/sling/{repoinit/jcr => jcr/repoinit}/impl/TestUtil.java | 4 +---
12 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpsProcessor.java b/src/main/java/org/apache/sling/jcr/repoinit/JcrRepoInitOpsProcessor.java
similarity index 96%
rename from src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpsProcessor.java
rename to src/main/java/org/apache/sling/jcr/repoinit/JcrRepoInitOpsProcessor.java
index 572a41e..31de8ca 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpsProcessor.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/JcrRepoInitOpsProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
import java.util.List;
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/impl/AclUtil.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
similarity index 98%
rename from src/main/java/org/apache/sling/repoinit/jcr/impl/AclUtil.java
rename to src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
index efe3cf5..e0828f8 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/impl/AclUtil.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import java.security.Principal;
import java.util.List;
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOperationVisitor.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOperationVisitor.java
similarity index 99%
rename from src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOperationVisitor.java
rename to src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOperationVisitor.java
index bfe7e97..153ff40 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOperationVisitor.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOperationVisitor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import static org.apache.sling.repoinit.parser.operations.AclLine.PROP_PATHS;
import static org.apache.sling.repoinit.parser.operations.AclLine.PROP_PRINCIPALS;
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOpsProcessorImpl.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
similarity index 93%
rename from src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOpsProcessorImpl.java
rename to src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
index c4e3ed0..4b633d2 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/impl/JcrRepoInitOpsProcessorImpl.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import java.util.List;
@@ -22,7 +22,7 @@ import javax.jcr.Session;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.repoinit.jcr.JcrRepoInitOpsProcessor;
+import org.apache.sling.jcr.repoinit.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.operations.Operation;
/** Apply Operations produced by the repoinit parser to a JCR Repository */
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/impl/RepositoryInitializer.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
similarity index 98%
rename from src/main/java/org/apache/sling/repoinit/jcr/impl/RepositoryInitializer.java
rename to src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
index adbca24..50e6f41 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/impl/RepositoryInitializer.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -37,11 +37,11 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.api.SlingRepositoryInitializer;
+import org.apache.sling.jcr.repoinit.JcrRepoInitOpsProcessor;
import org.apache.sling.provisioning.model.Feature;
import org.apache.sling.provisioning.model.Model;
import org.apache.sling.provisioning.model.Section;
import org.apache.sling.provisioning.model.io.ModelReader;
-import org.apache.sling.repoinit.jcr.JcrRepoInitOpsProcessor;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.osgi.framework.Constants;
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/impl/ServiceUserUtil.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/ServiceUserUtil.java
similarity index 98%
rename from src/main/java/org/apache/sling/repoinit/jcr/impl/ServiceUserUtil.java
rename to src/main/java/org/apache/sling/jcr/repoinit/impl/ServiceUserUtil.java
index 5f33145..203b069 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/impl/ServiceUserUtil.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/ServiceUserUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
diff --git a/src/main/java/org/apache/sling/repoinit/jcr/package-info.java b/src/main/java/org/apache/sling/jcr/repoinit/package-info.java
similarity index 96%
rename from src/main/java/org/apache/sling/repoinit/jcr/package-info.java
rename to src/main/java/org/apache/sling/jcr/repoinit/package-info.java
index a672011..e52e88f 100644
--- a/src/main/java/org/apache/sling/repoinit/jcr/package-info.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/package-info.java
@@ -16,6 +16,6 @@
******************************************************************************/
@Version("1.1.0")
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
import aQute.bnd.annotation.Version;
diff --git a/src/test/java/org/apache/sling/repoinit/jcr/CreatePathsTest.java b/src/test/java/org/apache/sling/jcr/repoinit/CreatePathsTest.java
similarity index 96%
rename from src/test/java/org/apache/sling/repoinit/jcr/CreatePathsTest.java
rename to src/test/java/org/apache/sling/jcr/repoinit/CreatePathsTest.java
index 23a560e..5fac3a0 100644
--- a/src/test/java/org/apache/sling/repoinit/jcr/CreatePathsTest.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/CreatePathsTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
import java.io.IOException;
import javax.jcr.RepositoryException;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.repoinit.jcr.impl.TestUtil;
+import org.apache.sling.jcr.repoinit.impl.TestUtil;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
diff --git a/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java b/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
similarity index 97%
rename from src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
rename to src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
index 4cbdcd4..fbb641e 100644
--- a/src/test/java/org/apache/sling/repoinit/jcr/CreateServiceUsersTest.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
import java.util.Random;
import javax.jcr.RepositoryException;
-import org.apache.sling.repoinit.jcr.impl.TestUtil;
+import org.apache.sling.jcr.repoinit.impl.TestUtil;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
diff --git a/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java b/src/test/java/org/apache/sling/jcr/repoinit/GeneralAclTest.java
similarity index 97%
rename from src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
rename to src/test/java/org/apache/sling/jcr/repoinit/GeneralAclTest.java
index 01424c7..764fa10 100644
--- a/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/GeneralAclTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
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.repoinit.jcr.impl.TestUtil;
+import org.apache.sling.jcr.repoinit.impl.TestUtil;
import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
diff --git a/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java b/src/test/java/org/apache/sling/jcr/repoinit/NonExistentPathTest.java
similarity index 96%
rename from src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
rename to src/test/java/org/apache/sling/jcr/repoinit/NonExistentPathTest.java
index 4c11e8f..2c34847 100644
--- a/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/NonExistentPathTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr;
+package org.apache.sling.jcr.repoinit;
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.repoinit.jcr.impl.TestUtil;
+import org.apache.sling.jcr.repoinit.impl.TestUtil;
import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
diff --git a/src/test/java/org/apache/sling/repoinit/jcr/impl/TestUtil.java b/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
similarity index 96%
rename from src/test/java/org/apache/sling/repoinit/jcr/impl/TestUtil.java
rename to src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
index 42e173c..2561ad1 100644
--- a/src/test/java/org/apache/sling/repoinit/jcr/impl/TestUtil.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.repoinit.jcr.impl;
+package org.apache.sling.jcr.repoinit.impl;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -33,8 +33,6 @@ 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.repoinit.jcr.impl.JcrRepoInitOperationVisitor;
-import org.apache.sling.repoinit.jcr.impl.ServiceUserUtil;
import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.repoinit.parser.impl.RepoInitParserService;
import org.apache.sling.repoinit.parser.operations.Operation;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.