Author: cziegeler
Date: Fri Jul 17 14:26:31 2009
New Revision: 795097
URL: http://svn.apache.org/viewvc?rev=795097&view=rev
Log:
SLING-1052 : Don't reexport jcr api and fixed some javadocs.
Modified:
sling/trunk/bundles/jcr/api/pom.xml
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
Modified: sling/trunk/bundles/jcr/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/pom.xml?rev=795097&r1=795096&r2=795097&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/pom.xml (original)
+++ sling/trunk/bundles/jcr/api/pom.xml Fri Jul 17 14:26:31 2009
@@ -57,15 +57,8 @@
</Bundle-Category>
<Export-Package>
<!-- Export provider API selectively -->
- org.apache.sling.jcr.api;version=${pom.version},
-
- <!-- Re-export JCR API -->
- javax.jcr.*;version=1.0
+ org.apache.sling.jcr.api;version=${pom.version}
</Export-Package>
- <Import-Package>
- org.xml.sax.*;resolution:=optional,
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -73,11 +66,10 @@
</build>
<dependencies>
- <!-- The libraries to be re-exported -->
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified:
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java?rev=795097&r1=795096&r2=795097&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
(original)
+++
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
Fri Jul 17 14:26:31 2009
@@ -23,10 +23,10 @@
import javax.jcr.Session;
/**
- * The <code>SessionProvider</code> extends the standard JCR Repository
+ * The <code>SlingRepository</code> extends the standard JCR repository
* interface with two methods: {...@link #getDefaultWorkspace()} and
* {...@link #loginAdministrative(String)}. This method ease the use of a JCR
- * repository in a Sling Application in that the default (or standard)
workspace
+ * repository in a Sling application in that the default (or standard)
workspace
* to use by the application may be configured and application bundles may use
a
* simple method to get an administrative session instead of being required to
* provide their own configuration of administrative session details.
@@ -39,14 +39,14 @@
/**
* Returns the default workspace to use on login.
- *
+ *
* @return null if the configured default workspace name is empty,
SLING-256
*/
String getDefaultWorkspace();
/**
* Returns a session to the default workspace which has administrative
- * powsers.
+ * powers.
* <p>
* <b><i>NOTE: This method is intended for use by infrastructure bundles to
* access the repository and provide general services. This method MUST not
