Author: cziegeler
Date: Tue Jan 22 05:22:20 2008
New Revision: 614198
URL: http://svn.apache.org/viewvc?rev=614198&view=rev
Log:
Clean up code, remove unused imports etc.
Modified:
incubator/sling/trunk/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderProviderImpl.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/VersionRange.java
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableProperty.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java
Modified:
incubator/sling/trunk/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderProviderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderProviderImpl.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderProviderImpl.java
(original)
+++
incubator/sling/trunk/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderProviderImpl.java
Tue Jan 22 05:22:20 2008
@@ -111,9 +111,7 @@
try {
return admin.impersonate(new SimpleCredentials(owner, new
char[0]));
} finally {
- if (admin != null) {
- admin.logout();
- }
+ admin.logout();
}
}
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
(original)
+++
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
Tue Jan 22 05:22:20 2008
@@ -42,7 +42,6 @@
import org.apache.sling.jcr.resource.internal.helper.ResourceProvider;
import org.apache.sling.jcr.resource.internal.helper.ResourceProviderEntry;
import
org.apache.sling.jcr.resource.internal.helper.bundle.BundleResourceProvider;
-import org.apache.sling.jcr.resource.internal.helper.jcr.JcrNodeResource;
import org.apache.sling.jcr.resource.internal.loader.Loader;
import
org.apache.sling.jcr.resource.internal.mapping.ObjectContentManagerFactory;
import org.osgi.framework.Bundle;
@@ -307,7 +306,7 @@
// assume this session has more access rights than the client Session
String workSpace = clientSession.getWorkspace().getName();
Session adminSession = getAdminSession(workSpace);
-
+
// SLING-159: Workaround for method throwing when called with
// a malformed path
try {
Modified:
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
(original)
+++
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
Tue Jan 22 05:22:20 2008
@@ -41,8 +41,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import freemarker.ext.ant.UnlinkedJythonOperationsImpl;
-
/** Servlet that implements the ujax POST "protocol", see SLING-92 */
public class MicrojaxPostServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = 1837674988291697074L;
@@ -83,7 +81,7 @@
* (or supplied) redirect URL
*/
public static final String RP_DISPLAY_EXTENSION = RP_PREFIX +
"displayExtension";
-
+
/** SLING-130, suffix that maps form field names to different JCR property
names */
public static final String VALUE_FROM_SUFFIX = "@ValueFrom";
@@ -168,7 +166,7 @@
// a generated node name
currentPath = currentPath.substring(0, currentPath.length() -
starSuffix.length());
currentPath += "/" +
nodeNameGenerator.getNodeName(request.getRequestParameterMap(), savePrefix);
-
+
// if resulting path exists, add a suffix until it's not the case
anymore
if(s.itemExists(currentPath)) {
String newPath = currentPath;
@@ -180,7 +178,7 @@
}
}
}
-
+
if(s.itemExists(currentPath)) {
throw new
HttpStatusCodeException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Collision in generated node names for path=" +
currentPath);
@@ -218,26 +216,26 @@
s.save();
response.sendRedirect(getRedirectUrl(request,currentNode.getPath()));
}
-
+
/** compute redirect URL (SLING-126) */
protected String getRedirectUrl(SlingHttpServletRequest request, String
currentNodePath) {
-
+
// redirect param has priority (but see below, magic star)
String result = request.getParameter(RP_REDIRECT_TO);
final boolean magicStar = "*".equals(result);
-
+
if(result==null || result.trim().length()==0) {
// try Referer
result = request.getHeader("Referer");
}
-
+
// redirect param = star means "redirect to current node", useful in
browsers
// when you don't want to use the Referer
if(magicStar || result==null || result.trim().length()==0) {
- // use path of current node, with optional extension
+ // use path of current node, with optional extension
final String redirectExtension =
request.getParameter(RP_DISPLAY_EXTENSION);
result = currentNodePath;
-
+
if(redirectExtension!=null) {
if(redirectExtension.startsWith(".")) {
result += redirectExtension;
@@ -245,17 +243,17 @@
result += "." + redirectExtension;
}
}
-
+
result =
SlingRequestPaths.getContextPath(request)
+ SlingRequestPaths.getServletPath(request)
+ result;
}
-
+
if(log.isDebugEnabled()) {
log.debug("Will redirect to " + result);
}
-
+
return result;
}
@@ -268,12 +266,12 @@
for(Map.Entry<String, RequestParameter[]> e :
request.getRequestParameterMap().entrySet()) {
final String paramName = e.getKey();
-
+
if(paramName.startsWith(RP_PREFIX)) {
- // do not store parameters with names starting with ujax:
+ // do not store parameters with names starting with ujax:
continue;
}
-
+
String propertyName = paramName;
if(savePrefix!=null) {
if(!paramName.startsWith(savePrefix)) {
@@ -281,15 +279,15 @@
}
propertyName = paramName.substring(savePrefix.length());
}
-
+
// SLING-130: VALUE_FROM_SUFFIX means take the value of this
// property from a different field
RequestParameter[] values = e.getValue();
final int vfIndex = propertyName.indexOf(VALUE_FROM_SUFFIX);
if(vfIndex >= 0) {
// @ValueFrom example:
- // <input name="./[EMAIL PROTECTED]" type="hidden"
value="fulltext" />
- // causes the JCR Text property to be set to the value of the
fulltext form field.
+ // <input name="./[EMAIL PROTECTED]" type="hidden"
value="fulltext" />
+ // causes the JCR Text property to be set to the value of the
fulltext form field.
propertyName = propertyName.substring(0, vfIndex);
final RequestParameter[] rp =
request.getRequestParameterMap().get(paramName);
if(rp == null || rp.length > 1) {
@@ -303,7 +301,7 @@
continue;
}
}
-
+
setProperty(n,request,propertyName,values,createdNodes);
}
}
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/VersionRange.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/VersionRange.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/VersionRange.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/VersionRange.java
Tue Jan 22 05:22:20 2008
@@ -18,8 +18,6 @@
import org.osgi.framework.Version;
-import sun.security.action.GetLongAction;
-
public class VersionRange {
/**
@@ -193,17 +191,17 @@
} else if (!(obj instanceof VersionRange)) {
return false;
}
-
+
VersionRange other = (VersionRange) obj;
-
+
if (!getLow().equals(other.getLow())) {
return false;
}
-
+
if (isLowInclusive() != other.isLowInclusive()) {
return false;
}
-
+
if (getHigh() == null) {
if (other.getHigh() != null) {
return false;
@@ -213,32 +211,32 @@
return false;
}
}
-
+
if (isHighInclusive() != other.isHighInclusive()) {
return false;
}
-
+
// if all checks succeeded, the ranges are equal
return true;
}
-
+
@Override
public int hashCode() {
int code = 17 * getLow().hashCode();
if (isLowInclusive()) {
code += 33;
}
-
+
if (getHigh() != null) {
code += 41 * getHigh().hashCode();
if (isHighInclusive()) {
code += 11;
}
}
-
+
return code;
}
-
+
/**
* Returns a string representation of this version range.
*/
Modified:
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableProperty.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableProperty.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableProperty.java
(original)
+++
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableProperty.java
Tue Jan 22 05:22:20 2008
@@ -18,16 +18,9 @@
*/
package org.apache.sling.scripting.javascript.wrapper;
-import java.io.InputStream;
-import java.util.Calendar;
-
-import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
-import javax.jcr.nodetype.PropertyDefinition;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.ScriptableObject;
@@ -37,16 +30,16 @@
public class ScriptableProperty extends ScriptableObject implements Wrapper {
public static final String CLASSNAME = "Property";
-
+
private Property property;
-
+
public ScriptableProperty() {
}
-
+
public ScriptableProperty(Property property) {
this.property = property;
}
-
+
public void jsConstructor(Object res) {
this.property = (Property) res;
}
@@ -218,7 +211,7 @@
}
//---------- Wrapper interface --------------------------------------------
-
+
public Object unwrap() {
return property;
}
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
Tue Jan 22 05:22:20 2008
@@ -32,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.api.SlingException;
import org.apache.sling.core.CoreConstants;
import org.apache.sling.core.auth.AuthenticationHandler;
import org.apache.sling.core.auth.AuthenticationInfo;
@@ -46,6 +45,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import sun.security.krb5.internal.Ticket;
+
/**
* The <code>SlingAuthenticator</code> class is the default implementation of
* the [EMAIL PROTECTED] SlingAuthenticator} interface. This class supports :
@@ -136,7 +137,7 @@
/** Whether access without credentials is allowed */
boolean anonymousAllowed;
-
+
/**
* The list of packages from the configuration file. This list is checked
* for each request. The handler of the first package match is used for the
@@ -259,9 +260,9 @@
log.error("authenticate: Cannot send status 503 to client",
ioe);
}
-
+
} catch (LoginException e) {
-
+
// request authentication information and send 403 (Forbidden)
// if no handler can request authentication information.
log.info("authenticate: Unable to authenticate: {}",
@@ -269,10 +270,10 @@
requestAuthentication(req, res);
} catch (RepositoryException re) {
-
+
// general problem, send a 500 Internal Server Error
log.error("authenticate: Unable to authenticate", re);
-
+
try {
res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Data Access Failure");
@@ -280,7 +281,7 @@
log.error("authenticate: Cannot send status 500 to client",
ioe);
}
-
+
}
// end request
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/ParameterSupport.java
Tue Jan 22 05:22:20 2008
@@ -18,8 +18,6 @@
*/
package org.apache.sling.core.impl.parameters;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Enumeration;
import java.util.Iterator;
@@ -37,7 +35,6 @@
import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
-import org.apache.sling.api.wrappers.SlingRequestPaths;
import org.apache.sling.core.impl.request.RequestData;
public class ParameterSupport {
@@ -124,10 +121,10 @@
final Map<?, ?> pMap = getServletRequest().getParameterMap();
for (Map.Entry<?, ?> entry : pMap.entrySet()) {
-
+
final String name = (String) entry.getKey();
final String[] values = (String[]) entry.getValue();
-
+
for (int i = 0; i < values.length; i++) {
final EncodedRequestParameter rp = new EncodedRequestParameter(
Util.ENCODING_DEFAULT);
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java?rev=614198&r1=614197&r2=614198&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/Util.java
Tue Jan 22 05:22:20 2008
@@ -19,8 +19,6 @@
package org.apache.sling.core.impl.parameters;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
