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/02/27 10:50:45 UTC
svn commit: r631530 - in /incubator/sling/trunk:
jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/
jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/
launchpad/launchpad-servlets/src/main/java/org/apache...
Author: cziegeler
Date: Wed Feb 27 01:50:37 2008
New Revision: 631530
URL: http://svn.apache.org/viewvc?rev=631530&view=rev
Log:
Clean up code.
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/UjaxPostProcessor.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/SessionInfoProvider.java
incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/UjaxInfoServlet.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
Modified: incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java Wed Feb 27 01:50:37 2008
@@ -109,7 +109,7 @@
protected Repository getDelegatee() throws RepositoryException {
if (this.delegatee == null) {
try {
- this.delegatee = (Repository) this.getRepository();
+ this.delegatee = this.getRepository();
} catch (IOException ioe) {
throw new RepositoryException(ioe.getMessage(), ioe);
}
@@ -160,31 +160,30 @@
private Repository getRepository() throws RepositoryException, IOException, RepositoryAccessor.RepositoryUrlException {
@SuppressWarnings("unchecked")
Dictionary<String, Object> environment = this.getComponentContext().getProperties();
-
+
// if the environment provides a repository override URL, other settings are ignored
final String overrideUrl = (String) environment.get(RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY);
-
- if(overrideUrl != null && overrideUrl.length() > 0) {
- log.log(LogService.LOG_INFO,
- "Will not use embedded repository due to property " + RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY
+
+ if (overrideUrl != null && overrideUrl.length() > 0) {
+ log.log(LogService.LOG_INFO,
+ "Will not use embedded repository due to property " + RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY
+ "=" + overrideUrl
+ ", acquiring repository using that URL"
);
return getRepositoryFromUrl(overrideUrl);
-
- } else {
- log.log(LogService.LOG_INFO,
- "Repository URL override property (" + RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY
- + ") not set, using embedded repository");
- return getEmbeddedRepository(environment);
+
}
+ log.log(LogService.LOG_INFO,
+ "Repository URL override property (" + RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY
+ + ") not set, using embedded repository");
+ return getEmbeddedRepository(environment);
}
-
+
private Repository getRepositoryFromUrl(String repositoryUrl) throws RepositoryAccessor.RepositoryUrlException {
return new RepositoryAccessor().getRepositoryFromURL(repositoryUrl);
}
-
- private Repository getEmbeddedRepository(Dictionary<String, Object> environment)
+
+ private Repository getEmbeddedRepository(Dictionary<String, Object> environment)
throws RepositoryException, IOException {
String configURLObj = (String) environment.get(REPOSITORY_CONFIG_URL);
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java Wed Feb 27 01:50:37 2008
@@ -40,21 +40,21 @@
/**
* Creates a new instance iterating over the given path
- *
+ *
* @param path The path to iterate over. If this is empty or
* <code>null</code> this iterator will not return anything.
*/
public ResourcePathIterator(String path) {
if (path == null || path.length() == 0) {
-
+
// null or empty path, there is nothing to return
nextPath = null;
} else {
// find last non-slash character
- int i = (path != null) ? path.length() - 1 : -1;
+ int i = path.length() - 1;
while (i >= 0 && path.charAt(i) == '/') {
i--;
}
Modified: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/UjaxPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/UjaxPostProcessor.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/UjaxPostProcessor.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/UjaxPostProcessor.java Wed Feb 27 01:50:37 2008
@@ -318,9 +318,8 @@
}
if (currentPath == null) {
return rootPath + "/" + path;
- } else {
- return currentPath + "/" + path;
}
+ return currentPath + "/" + path;
}
/**
Modified: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/SessionInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/SessionInfoProvider.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/SessionInfoProvider.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/SessionInfoProvider.java Wed Feb 27 01:50:37 2008
@@ -21,21 +21,19 @@
import java.util.HashMap;
import java.util.Map;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.api.SlingException;
import org.apache.sling.api.SlingHttpServletRequest;
public class SessionInfoProvider implements UjaxInfoProvider {
static final String PROVIDER_LABEL = "sessionInfo";
-
+
public Map<String, String> getInfo(SlingHttpServletRequest request) {
final Map<String, String> result = new HashMap<String, String>();
final Session s = request.getResourceResolver().adaptTo(Session.class);
-
+
result.put("workspace",s.getWorkspace().getName());
result.put("userID",s.getUserID());
Modified: incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/UjaxInfoServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/UjaxInfoServlet.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/UjaxInfoServlet.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/src/main/java/org/apache/sling/ujax/info/UjaxInfoServlet.java Wed Feb 27 01:50:37 2008
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
@@ -36,7 +35,7 @@
/**
* The <code>UjaxInfoServlet</code> TODO
- *
+ *
* @scr.service interface="javax.servlet.Servlet"
* @scr.component immediate="true" metatype="false"
* @scr.property name="service.description" value="ujax Info Servlet"
@@ -80,7 +79,7 @@
}
}
-
+/*
private void listOptions(SlingHttpServletResponse response)
throws IOException {
@@ -110,7 +109,7 @@
out.flush();
}
-
+*/
private void renderJson(SlingHttpServletResponse response,
Map<String, String> data) throws IOException {
// render data in JSON format
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java?rev=631530&r1=631529&r2=631530&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java Wed Feb 27 01:50:37 2008
@@ -21,14 +21,12 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import java.util.Map;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.core.RequestUtil;
import org.apache.sling.core.impl.request.RequestData;
import org.apache.sling.core.servlets.ErrorHandler;
@@ -149,7 +147,7 @@
ErrorHandler eh = getRequestData().getSlingMainServlet().getErrorHandler();
eh.handleError(sc, msg, requestData.getSlingRequest(), this);
}
-
+
@Override
public void setStatus(int sc, String sm) {
checkCommitted();