You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/05/30 11:40:51 UTC
svn commit: r661618 - in /incubator/sling/trunk/servlets: get/pom.xml
post/pom.xml
post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java
resolver/pom.xml
Author: cziegeler
Date: Fri May 30 02:40:50 2008
New Revision: 661618
URL: http://svn.apache.org/viewvc?rev=661618&view=rev
Log:
SLING-483: Add excludes for javadocs and fix javadocs (WiP)
Modified:
incubator/sling/trunk/servlets/get/pom.xml
incubator/sling/trunk/servlets/post/pom.xml
incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java
incubator/sling/trunk/servlets/resolver/pom.xml
Modified: incubator/sling/trunk/servlets/get/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/get/pom.xml?rev=661618&r1=661617&r2=661618&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/get/pom.xml (original)
+++ incubator/sling/trunk/servlets/get/pom.xml Fri May 30 02:40:50 2008
@@ -73,6 +73,20 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling.servlets.get
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/sling/trunk/servlets/post/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/pom.xml?rev=661618&r1=661617&r2=661618&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/post/pom.xml (original)
+++ incubator/sling/trunk/servlets/post/pom.xml Fri May 30 02:40:50 2008
@@ -74,6 +74,20 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling.servlets.post.impl
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
<dependency>
Modified: incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java?rev=661618&r1=661617&r2=661618&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java (original)
+++ incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractSlingPostOperation.java Fri May 30 02:40:50 2008
@@ -54,7 +54,7 @@
* been done in the {@link #doRun(SlingHttpServletRequest, HtmlResponse)}
* method the session is saved if there are unsaved modifications. In case
* of errorrs, the unsaved changes in the session are rolled back.
- *
+ *
* @param request the request to operate on
* @param response The <code>HtmlResponse</code> to record execution
* progress.
@@ -120,7 +120,7 @@
* is set with valid resources an empty iterator is returned. Any resources
* addressed in the {@link SlingPostConstants#RP_APPLY_TO} parameter is
* ignored.
- *
+ *
* @param request The <code>SlingHttpServletRequest</code> object used to
* get the {@link SlingPostConstants#RP_APPLY_TO} parameter.
* @return The iterator of resources listed in the parameter or
@@ -128,19 +128,19 @@
*/
protected Iterator<Resource> getApplyToResources(
SlingHttpServletRequest request) {
-
+
String[] applyTo = request.getParameterValues(SlingPostConstants.RP_APPLY_TO);
if (applyTo == null) {
return null;
}
-
+
return new ApplyToIterator(request, applyTo);
}
/**
* Returns an external form of the given path prepending the context path
* and appending a display extension.
- *
+ *
* @param path the path to externalize
* @return the url
*/
@@ -164,7 +164,7 @@
/**
* Resolves the given path with respect to the current root path.
- *
+ *
* @param relPath the path to resolve
* @return the given path if it starts with a '/'; a resolved path
* otherwise.
@@ -219,9 +219,8 @@
* syntax is supported: <xmp> | first | before all child nodes | before A |
* before child node A | after A | after child node A | last | after all
* nodes | N | at a specific position, N being an integer </xmp>
- *
- * @param node node to order
- * @param command specifies the ordering type
+ *
+ * @param item node to order
* @throws RepositoryException if an error occurs
*/
protected void orderNode(SlingHttpServletRequest request, Item item)
@@ -315,20 +314,20 @@
private final ResourceResolver resolver;
private final Resource baseResource;
private final String[] paths;
-
+
private int pathIndex;
-
+
private Resource nextResource;
-
+
ApplyToIterator(SlingHttpServletRequest request, String[] paths) {
this.resolver = request.getResourceResolver();
this.baseResource = request.getResource();
this.paths = paths;
this.pathIndex = 0;
-
+
nextResource = seek();
}
-
+
public boolean hasNext() {
return nextResource != null;
}
@@ -337,17 +336,17 @@
if (!hasNext()) {
throw new NoSuchElementException();
}
-
+
Resource result = nextResource;
nextResource = seek();
-
+
return result;
}
public void remove() {
throw new UnsupportedOperationException();
}
-
+
private Resource seek() {
while (pathIndex < paths.length) {
String path = paths[pathIndex];
@@ -358,7 +357,7 @@
return res;
}
}
-
+
// no more elements in the array
return null;
}
Modified: incubator/sling/trunk/servlets/resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/pom.xml?rev=661618&r1=661617&r2=661618&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/pom.xml (original)
+++ incubator/sling/trunk/servlets/resolver/pom.xml Fri May 30 02:40:50 2008
@@ -68,6 +68,20 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling.servlets.resolver
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>