incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r762699 - in /incubator/sling/trunk/bundles/servlets/resolver: ./ src/main/java/org/apache/sling/servlets/resolver/ src/main/java/org/apache/sling/servlets/resolver/defaults/ src/main/java/org/apache/sling/servlets/resolver/helper/ src/main...
Date Tue, 07 Apr 2009 11:23:09 GMT
Author: fmeschbe
Date: Tue Apr  7 11:23:08 2009
New Revision: 762699

URL: http://svn.apache.org/viewvc?rev=762699&view=rev
Log:
SLING-916 move non-exported packages to internal packages and remove javadoc
configuration which will be inherited from parent pom

Added:
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
  (contents, props changed)
      - copied, changed from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
  (contents, props changed)
      - copied, changed from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/
  (props changed)
      - copied from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/
  (props changed)
      - copied from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/
  (props changed)
      - copied from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
  (contents, props changed)
      - copied, changed from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/
  (props changed)
      - copied from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/
  (props changed)
      - copied from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/
Removed:
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/
Modified:
    incubator/sling/trunk/bundles/servlets/resolver/pom.xml
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultServlet.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/LocationIterator.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/SlingServletConfig.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResource.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResource.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
    incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/HelperTestBase.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollectorGetServletsTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ScriptSelectionTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResourceTest.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/MockServletResource.java
    incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java

Modified: incubator/sling/trunk/bundles/servlets/resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/pom.xml?rev=762699&r1=762698&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ incubator/sling/trunk/bundles/servlets/resolver/pom.xml Tue Apr  7 11:23:08 2009
@@ -62,20 +62,6 @@
             </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>

Copied: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
(from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java?p2=incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java&p1=incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java&r1=754645&r2=762699&rev=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver;
+package org.apache.sling.servlets.resolver.internal;
 
 public class ServletResolverConstants {
 
@@ -84,7 +84,7 @@
      * The resource type of a registered servlet used as the default servlet if
      * no other servlet or script could be selected (value is
      * "sling/servlet/default"). If no servlet is registered under this name,
-     * the {@link org.apache.sling.servlets.resolver.defaults.DefaultServlet} is
+     * the {@link org.apache.sling.servlets.resolver.internal.defaults.DefaultServlet} is
      * used.
      */
     public static final String DEFAULT_SERVLET_NAME = "sling/servlet/default";

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
(from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?p2=incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java&p1=incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java&r1=754645&r2=762699&rev=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver;
+package org.apache.sling.servlets.resolver.internal;
 
 import static org.apache.sling.api.SlingConstants.ERROR_MESSAGE;
 import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
@@ -56,12 +56,12 @@
 import org.apache.sling.engine.RequestUtil;
 import org.apache.sling.engine.servlets.AbstractServiceReferenceConfig;
 import org.apache.sling.engine.servlets.ErrorHandler;
-import org.apache.sling.servlets.resolver.defaults.DefaultErrorHandlerServlet;
-import org.apache.sling.servlets.resolver.defaults.DefaultServlet;
-import org.apache.sling.servlets.resolver.helper.ResourceCollector;
-import org.apache.sling.servlets.resolver.helper.SlingServletConfig;
-import org.apache.sling.servlets.resolver.resource.ServletResourceProvider;
-import org.apache.sling.servlets.resolver.resource.ServletResourceProviderFactory;
+import org.apache.sling.servlets.resolver.internal.defaults.DefaultErrorHandlerServlet;
+import org.apache.sling.servlets.resolver.internal.defaults.DefaultServlet;
+import org.apache.sling.servlets.resolver.internal.helper.ResourceCollector;
+import org.apache.sling.servlets.resolver.internal.helper.SlingServletConfig;
+import org.apache.sling.servlets.resolver.internal.resource.ServletResourceProvider;
+import org.apache.sling.servlets.resolver.internal.resource.ServletResourceProviderFactory;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -72,7 +72,8 @@
 /**
  * The <code>SlingServletResolver</code> TODO
  * 
- * @scr.component label="%servletresolver.name"
+ * @scr.component name="org.apache.sling.servlets.resolver.SlingServletResolver"
+ *                label="%servletresolver.name"
  *                description="%servletresolver.description"
  * @scr.property name="service.description" value="Sling Servlet Resolver and
  *               Error Handler"

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.defaults;
+package org.apache.sling.servlets.resolver.internal.defaults;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultServlet.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultServlet.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultServlet.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.defaults;
+package org.apache.sling.servlets.resolver.internal.defaults;
 
 import java.io.IOException;
 

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/LocationIterator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/LocationIterator.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/LocationIterator.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/LocationIterator.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -24,7 +24,7 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.servlets.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.internal.ServletResolverConstants;
 
 /**
  * The <code>LocationIterator</code> provides access to an ordered collection

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -30,7 +30,7 @@
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.SyntheticResource;
-import org.apache.sling.servlets.resolver.resource.ServletResourceProviderFactory;
+import org.apache.sling.servlets.resolver.internal.resource.ServletResourceProviderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,7 +103,7 @@
      * @param baseResourceType The basic resource type to use as a final
      *            resource super type. If this is <code>null</code> the
      *            default value
-     *            {@link org.apache.sling.servlets.resolver.ServletResolverConstants#DEFAULT_SERVLET_NAME}
+     *            {@link org.apache.sling.servlets.resolver.internal.ServletResolverConstants#DEFAULT_SERVLET_NAME}
      *            is assumed.
      */
     public ResourceCollector(String methodName, String baseResourceType) {
@@ -125,7 +125,7 @@
      * @param baseResourceType The basic resource type to use as a final
      *            resource super type. If this is <code>null</code> the
      *            default value
-     *            {@link org.apache.sling.servlets.resolver.ServletResolverConstants#DEFAULT_SERVLET_NAME}
+     *            {@link org.apache.sling.servlets.resolver.internal.ServletResolverConstants#DEFAULT_SERVLET_NAME}
      *            is assumed.
      */
     private ResourceCollector(SlingHttpServletRequest request) {

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/SlingServletConfig.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/SlingServletConfig.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/SlingServletConfig.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/SlingServletConfig.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResource.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResource.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResource.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceWrapper;

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResource.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResource.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResource.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
 import javax.servlet.Servlet;
 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
 import java.util.HashSet;
 import java.util.Iterator;

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
 import java.util.Iterator;
 import java.util.Set;

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
Tue Apr  7 11:23:08 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_METHODS;
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_PATHS;
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_SELECTORS;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_METHODS;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_PATHS;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_SELECTORS;
 
 import java.util.HashSet;
 import java.util.Set;

Copied: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
(from r754645, incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java?p2=incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java&p1=incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java&r1=754645&r2=762699&rev=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver;
+package org.apache.sling.servlets.resolver.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,9 +37,7 @@
 import org.apache.sling.commons.testing.sling.MockResourceResolver;
 import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
 import org.apache.sling.engine.EngineConstants;
-import org.apache.sling.servlets.resolver.ServletResolverConstants;
-import org.apache.sling.servlets.resolver.SlingServletResolver;
-import org.apache.sling.servlets.resolver.resource.MockServletResource;
+import org.apache.sling.servlets.resolver.internal.resource.MockServletResource;
 import org.osgi.framework.Constants;
 
 public class SlingServletResolverTest extends TestCase {

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/HelperTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/HelperTestBase.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/HelperTestBase.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/HelperTestBase.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import junit.framework.TestCase;
 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
Tue Apr  7 11:23:08 2009
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
-import static org.apache.sling.servlets.resolver.ServletResolverConstants.DEFAULT_SERVLET_NAME;
+import static org.apache.sling.servlets.resolver.internal.ServletResolverConstants.DEFAULT_SERVLET_NAME;
 
 import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.servlets.resolver.helper.LocationIterator;
 
 public class LocationIteratorTest extends HelperTestBase {
 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollectorGetServletsTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollectorGetServletsTest.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollectorGetServletsTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollectorGetServletsTest.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ScriptSelectionTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ScriptSelectionTest.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ScriptSelectionTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/ScriptSelectionTest.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import java.util.Collection;
 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResourceTest.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResourceTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/WeightedResourceTest.java
Tue Apr  7 11:23:08 2009
@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.helper;
-
-import org.apache.sling.servlets.resolver.helper.WeightedResource;
+package org.apache.sling.servlets.resolver.internal.helper;
 
 import junit.framework.TestCase;
 

Propchange: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/MockServletResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/MockServletResource.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/MockServletResource.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/MockServletResource.java
Tue Apr  7 11:23:08 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
 import javax.servlet.Servlet;
 
 import org.apache.sling.api.resource.ResourceResolver;
 
 public class MockServletResource extends
-        org.apache.sling.servlets.resolver.resource.ServletResource {
+        org.apache.sling.servlets.resolver.internal.resource.ServletResource {
     public MockServletResource(ResourceResolver resourceResolver,
             Servlet servlet, String path) {
         super(resourceResolver, servlet, path);

Modified: incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java?rev=762699&r1=754645&r2=762699&view=diff
==============================================================================
--- incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
(original)
+++ incubator/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
Tue Apr  7 11:23:08 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.servlets.resolver.resource;
+package org.apache.sling.servlets.resolver.internal.resource;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -31,7 +31,7 @@
 import org.apache.sling.api.servlets.HttpConstants;
 import org.apache.sling.commons.testing.osgi.MockServiceReference;
 import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.servlets.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.internal.ServletResolverConstants;
 
 public class ServletResourceProviderCreateTest extends TestCase {
 



Mime
View raw message