SLING-1372 Reverting previous commits to get to a place where jcr bundles can be released.
Squashed commit of the following:
commit 09ff06e6e95cacef6313232f7aa637175ffb7acc
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 12:34:00 2010 +0000
Part added SLING-1366 back in Revert "Revert "SLING-1366 : Use dynamic proxy to handle session#impersonate call.""
This reverts commit d0681511cdc8d1b3f18688c5ee2ee71b12e3e76a.
Conflicts:
bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
commit 956e758b6985f6e98e50aaf98508be7f8bf5d36d
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:03:57 2010 +0000
Revert "SLING-1363 - adding SessionConfigurer interface"
This reverts commit 388f1b9373207ae207aa33f5d5c49ff874fd349a.
commit 4e15f0839cd088db62b32a1632f03f8dfd406253
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:03:24 2010 +0000
Revert "SLING-1363 Must start the session configurer tracker before starting the repository because starting the repository tries to login which in turn accesses the tracker thus causing an NPE."
This reverts commit d5816bca2af56046d891311f1586e224690f73ab.
commit c9c885385ecb14917e7341c4656c822836abd918
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:02:46 2010 +0000
Revert "SLING-1366 : Readd call to NamespaceMapper"
This reverts commit 0f8b5c33cd02ec555a527c755b66b827e80ed458.
commit 90ff911034433cef76556fff6c1d0ef8f7e04cfc
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:01:46 2010 +0000
Revert "fixing SLING-1367"
This reverts commit 33ada52357a8196805c564446d90caf4bf7c6272.
commit a3e34b648b6ccde37a052276d8c589cd430c0ef0
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:01:28 2010 +0000
Revert "SLING-1363 - removing SessionConfigurer interface and moving NamespaceMapper from base to api. Created tests for both dynamic NamespaceMapper and static Sling-Namespaces namespace registration. Note - this involved updating the version of jcr.api in the bundle list file which also required including the JCR 2 API bundle."
This reverts commit f7cb30cc73300fec3a49c00d05936bad9a63280a.
commit a3b32db61b15c2b881733def84770be1fcd96730
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:00:56 2010 +0000
Revert "correcting jcr.api package version"
This reverts commit 21761508bc005ea52150706134da2406b47cb809.
commit 900e2542ea0a2e38aa09f437fa0521382cf3058e
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 10:00:25 2010 +0000
Revert "SLING-1363 - We added a new interface so we should increase the minor version of the exported api; minor cleanup of the interface and a little javadoc."
This reverts commit ea7da107dfd3c2b4f26662469ff6fee66cf2d7f0.
commit d0681511cdc8d1b3f18688c5ee2ee71b12e3e76a
Author: Ian Boston <ieb@tfd.co.uk>
Date: Fri Feb 12 09:59:56 2010 +0000
Revert "SLING-1366 : Use dynamic proxy to handle session#impersonate call."
This reverts commit 01ad0d9bd358ce323a5675ef0714a62108a2c24a.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@909431 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 9423fa7..1de992c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -57,8 +57,8 @@
</Bundle-Category>
<Export-Package>
<!-- Export provider API selectively -->
- org.apache.sling.jcr.api;version=2.1.0
- </Export-Package>
+ org.apache.sling.jcr.api;version=2.0.2
+ </Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java b/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
deleted file mode 100644
index 222070a..0000000
--- a/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.jcr.api;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-/**
- * This interface is used to customize the namespace mapping of
- * a session.
- * @since 2.1
- */
-public interface NamespaceMapper {
-
- /**
- * This method is invoked whenever a new session is created.
- * It allows the service to add own namespace prefixes.
- * @param session The new session
- * @throws RepositoryException If anything goes wrong
- */
- void defineNamespacePrefixes(Session session)
- throws RepositoryException;
-}
diff --git a/src/main/java/org/apache/sling/jcr/api/SlingRepository.java b/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
index e732d71..711d59a 100644
--- a/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
+++ b/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
@@ -34,12 +34,6 @@
* Implementations of this interface will generally provide configurability of
* the default workspace name as well as the access details for the
* administrative session.
- * <p>
- * Implementations of SlingRepository are expected to invoke any available
- * implementations of the {@link SessionConfigurer} interface <b>before</b>
- * returning <b>any</b> {@link Session} to callers. This includes the methods
- * defined in the {@link Repository} interface.
- *
*/
public interface SlingRepository extends Repository {
