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/03/06 14:21:19 UTC
svn commit: r634263 - in /incubator/sling/trunk:
jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/
jcr/resource/src/main/java/org/apache/sling/jcr/resource/
jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/hel...
Author: cziegeler
Date: Thu Mar 6 05:21:16 2008
New Revision: 634263
URL: http://svn.apache.org/viewvc?rev=634263&view=rev
Log:
Remove unused imports.
Modified:
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/SyntheticResource.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
Modified: incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java Thu Mar 6 05:21:16 2008
@@ -23,7 +23,6 @@
import java.util.Hashtable;
import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.AbstractSlingRepository;
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/SyntheticResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/SyntheticResource.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/SyntheticResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/SyntheticResource.java Thu Mar 6 05:21:16 2008
@@ -1,4 +1,4 @@
-/*
+ /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,8 +18,6 @@
*/
package org.apache.sling.jcr.resource;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
/**
@@ -29,6 +27,7 @@
* <p>
* @deprecated to be removed soooon
*/
+@Deprecated
public class SyntheticResource extends
org.apache.sling.api.resource.SyntheticResource {
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java Thu Mar 6 05:21:16 2008
@@ -22,7 +22,6 @@
import java.util.NoSuchElementException;
import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java Thu Mar 6 05:21:16 2008
@@ -20,7 +20,6 @@
import java.io.InputStream;
import java.util.Calendar;
-import java.util.Collections;
import java.util.Iterator;
import javax.jcr.Item;
@@ -39,7 +38,7 @@
/** default log */
private final Logger log = LoggerFactory.getLogger(getClass());
-
+
private final Property property;
private final String resourceType;
@@ -105,7 +104,7 @@
private InputStream getInputStream() {
Property prop = getProperty();
-
+
try {
// we set the content length only if the input stream is
// fetched. otherwise the repository needs to load the
@@ -113,18 +112,18 @@
// for all resources that do need to provide the stream
long length = prop.getLength();
InputStream stream = prop.getStream();
-
+
getResourceMetadata().setContentLength(length);
return stream;
} catch (RepositoryException re) {
log.error("getInputStream: Problem accessing the property "
+ getPath() + " stream", re);
}
-
+
// fall back to none in case of an error
return null;
}
-
+
@Override
Iterator<Resource> listChildren() {
return null;
Modified: incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java (original)
+++ incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java Thu Mar 6 05:21:16 2008
@@ -18,17 +18,13 @@
*/
package org.apache.sling.jcr.resource.internal.helper.jcr;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.jcr.NamespaceRegistry;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.SlingConstants;
-import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.resource.JcrResourceConstants;
@@ -45,14 +41,14 @@
'e', 's', 't' };
protected ResourceResolver resourceResolver;
-
+
protected String rootPath;
protected Node rootNode;
protected void setUp() throws Exception {
super.setUp();
-
+
resourceResolver = new MockResourceResolver(getSession());
try {
Modified: incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java (original)
+++ incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java Thu Mar 6 05:21:16 2008
@@ -19,19 +19,14 @@
package org.apache.sling.jcr.resource.internal.helper.jcr;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import javax.jcr.NamespaceRegistry;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.swing.RootPaneContainer;
import org.apache.jackrabbit.JcrConstants;
-import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
-import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.resource.JcrResourceConstants;
public class JcrNodeResourceTest extends JcrItemResourceTestBase {
@@ -108,18 +103,18 @@
String name = "resourceType";
Node node = rootNode.addNode(name, JcrConstants.NT_UNSTRUCTURED);
getSession().save();
-
+
JcrNodeResource jnr = new JcrNodeResource(null, node);
assertEquals(JcrConstants.NT_UNSTRUCTURED, jnr.getResourceType());
-
+
String typeName = "some/resource/type";
node.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, typeName);
getSession().save();
-
+
jnr = new JcrNodeResource(null, node);
assertEquals(typeName, jnr.getResourceType());
}
-
+
public void testResourceSuperType() throws Exception {
String name = "resourceSuperType";
String typeNodeName = "some_resource_type";
@@ -138,7 +133,7 @@
Node typeNode = rootNode.addNode(typeNodeName, JcrConstants.NT_UNSTRUCTURED);
typeNode.setProperty(JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY, superTypeName);
getSession().save();
-
+
jnr = new JcrNodeResource(resourceResolver, node);
assertEquals(typeName, jnr.getResourceType());
assertEquals(superTypeName, jnr.getResourceSuperType());
@@ -147,7 +142,7 @@
String otherSuperTypeName = "othersupertype";
node.setProperty(JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY, otherSuperTypeName);
getSession().save();
-
+
jnr = new JcrNodeResource(resourceResolver, node);
assertEquals(typeName, jnr.getResourceType());
assertEquals(otherSuperTypeName, jnr.getResourceSuperType());
@@ -176,5 +171,5 @@
assertEquals(TEST_TYPE, rm.getContentType());
assertEquals(TEST_ENCODING, rm.getCharacterEncoding());
}
-
+
}
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Thu Mar 6 05:21:16 2008
@@ -38,7 +38,6 @@
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpAnyMethod;
import org.apache.sling.launchpad.webapp.integrationtest.helpers.UslingIntegrationTestClient;
import org.apache.sling.ujax.UjaxPostServlet;
@@ -66,7 +65,7 @@
protected HttpClient httpClient;
private static Boolean slingStartupOk;
-
+
/** Class that creates a test node under the given parentPath, and
* stores useful values for testing. Created for JspScriptingTest,
* older test classes do not use it, but it might simplify them.
@@ -258,7 +257,7 @@
protected String getContent(String url, String expectedContentType) throws IOException {
return getContent(url, expectedContentType, null);
}
-
+
/** retrieve the contents of given URL and assert its content type
* @throws IOException
* @throws HttpException */
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Thu Mar 6 05:21:16 2008
@@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
@@ -71,7 +70,7 @@
/**
* The <code>SlingServletResolver</code> TODO
- *
+ *
* @scr.component label="%servletresolver.name"
* description="%servletresolver.description"
* @scr.property name="service.description" value="Sling Servlet Resolver and
@@ -166,7 +165,7 @@
}
}
}
-
+
// (4) default script name and default servlet name and selectors
if (servlet == null) {
pathIterator.reset(DEFAULT_SERVLET_NAME);
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java Thu Mar 6 05:21:16 2008
@@ -20,7 +20,6 @@
import java.io.IOException;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java?rev=634263&r1=634262&r2=634263&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java Thu Mar 6 05:21:16 2008
@@ -29,7 +29,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.NoSuchElementException;
import java.util.Set;
import javax.servlet.Servlet;
@@ -163,14 +162,14 @@
Servlet getServlet() {
return servlet;
}
-
+
Iterator<String> getServletPathIterator() {
return resourcePaths.iterator();
}
-
+
public String[] getSerlvetPaths() {
return resourcePaths.toArray(new String[resourcePaths.size()]);
}
-
-
+
+
}