Author: fmeschbe
Date: Fri Aug 13 14:42:23 2010
New Revision: 985214
URL: http://svn.apache.org/viewvc?rev=985214&view=rev
Log:
* JavaDoc Fixes
* Explicitly list all exported packages with their export version
* Set JIRA version reference property
Modified:
sling/trunk/bundles/api/pom.xml
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
Modified: sling/trunk/bundles/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=985214&r1=985213&r2=985214&view=diff
==============================================================================
--- sling/trunk/bundles/api/pom.xml (original)
+++ sling/trunk/bundles/api/pom.xml Fri Aug 13 14:42:23 2010
@@ -49,6 +49,10 @@
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/api</url>
</scm>
+ <properties>
+ <site.jira.version.id>12314252</site.jira.version.id>
+ </properties>
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -59,7 +63,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
@@ -84,8 +88,14 @@
http://sling.apache.org/site/sling-api.html
</Bundle-DocURL>
<Export-Package>
+ org.apache.sling.api;version=2.1, <!-- 2.0.8 -->
+ org.apache.sling.api.adapter;version=2.1,
org.apache.sling.api.auth;version=1.0,
- org.apache.sling.api.*;version=2.1
+ org.apache.sling.api.request;version=2.1,
+ org.apache.sling.api.resource;version=2.1,
+ org.apache.sling.api.scripting;version=2.1,
+ org.apache.sling.api.servlets;version=2.1,
+ org.apache.sling.api.wrappers;version=2.1
</Export-Package>
<!-- Require explicit version of the servlet API -->
<Import-Package>
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java?rev=985214&r1=985213&r2=985214&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
Fri Aug 13 14:42:23 2010
@@ -423,7 +423,7 @@ public class ResourceUtil {
*
* @param resource the resource to check
* @param resourceType the resource type to check the resource against
- * @retrun <code>false</code> if <code>resource</code> is
<code>null</code>.
+ * @return <code>false</code> if <code>resource</code> is
<code>null</code>.
* Otherwise returns the result of calling
* {...@link Resource#isResourceType(String)} with the given
* <code>resourceType</code>.
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java?rev=985214&r1=985213&r2=985214&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
Fri Aug 13 14:42:23 2010
@@ -170,7 +170,7 @@ public interface SlingScriptHelper {
* }
* </pre>
*
- * @param path The resource to include.
+ * @param resource The resource to include.
* @param options influence the rendering of the included Resource
* @throws org.apache.sling.api.SlingIOException Wrapping a
<code>IOException</code> thrown
* while handling the include.
@@ -278,7 +278,7 @@ public interface SlingScriptHelper {
* {...@link RequestDispatcherOptions#RequestDispatcherOptions(String)}
* constructor.
*
- * @param path The resource to forward to.
+ * @param resource The resource to forward to.
* @param requestDispatcherOptions influence the rendering of the forwarded
* Resource
* @throws org.apache.sling.api.SlingIOException Wrapping a
<code>IOException</code> thrown
@@ -304,7 +304,7 @@ public interface SlingScriptHelper {
* }
* </pre>
*
- * @param path The resource to forward the request to.
+ * @param resource The resource to forward the request to.
* @param options influence the rendering of the forwarded Resource
* @throws org.apache.sling.api.SlingIOException Wrapping a
<code>IOException</code> thrown
* while handling the forward.
