Author: cziegeler Date: Wed Jan 19 17:00:24 2011 New Revision: 1060865 URL: http://svn.apache.org/viewvc?rev=1060865&view=rev Log: Fix test case and correct all licence headers to be before the package statement
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java Wed Jan 19 17:00:24 2011 @@ -1,9 +1,25 @@ +/* + * 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 regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.sling.launchpad.testservices.exported; public enum TestEnum { FOO, BAR; - + public static TestEnum parse(String str) { if(str.contains("foo")) { return FOO; Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.filters; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.filters; /** Example/test Filter. * Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.filters; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.filters; /** Example/test Sling Servlet registered with two extensions * @@ -25,6 +24,8 @@ package org.apache.sling.launchpad.tests * @scr.property name="service.description" value="Test Filter" * @scr.property name="service.vendor" value="The Apache Software Foundation" * + * @scr.property name="sling.filter.scope" value="request" + * * Register this filter with the no pattern registration properties */ public class NoPropertyFilter extends TestFilter { Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.filters; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,11 +14,13 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.filters; /** Example/test Sling Servlet registered with two extensions * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Filter" + * @scr.property name="sling.filter.scope" value="request" * * @scr.property name="service.description" value="Test Filter" * @scr.property name="service.vendor" value="The Apache Software Foundation" Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java Wed Jan 19 17:00:24 2011 @@ -1,16 +1,3 @@ -package org.apache.sling.launchpad.testservices.filters; - -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,15 +14,27 @@ import javax.servlet.http.HttpServletRes * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.filters; + +import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Example/test Filter. */ abstract class TestFilter implements Filter { - - private FilterConfig filterConfig; - + public void init(FilterConfig filterConfig) throws ServletException { - this.filterConfig = filterConfig; + // nothing to do } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.scripting; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.scripting; import javax.script.Bindings; Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.scripting; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.scripting; import javax.script.Bindings; Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.scripting; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.scripting; import javax.script.Bindings; Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.servlets; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,24 +14,25 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.servlets; /** Example/test Sling Servlet registered with two extensions - * + * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Servlet" - * + * * @scr.property name="service.description" value="Default Query Servlet" * @scr.property name="service.vendor" value="The Apache Software Foundation" - * + * * Register this servlet for the default resource type and two selectors: * @scr.property name="sling.servlet.resourceTypes" * value="sling/servlet/default" - * + * * @scr.property name="sling.servlet.extensions" * values.1 = "TEST_EXT_1" - * values.2 = "TEST_EXT_2" + * values.2 = "TEST_EXT_2" */ @SuppressWarnings("serial") -public class ExtensionServlet extends TestServlet { +public class ExtensionServlet extends TestServlet { } \ No newline at end of file Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java Wed Jan 19 17:00:24 2011 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.sling.launchpad.testservices.servlets; /** Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.servlets; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,16 +14,17 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.servlets; /** Example/test Sling Servlet using a prefix to demonstrate how * PrefixServletZero overrides PrefixServletMinusOne - * + * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Servlet" - * + * * @scr.property name="service.description" value="Default Query Servlet" * @scr.property name="service.vendor" value="The Apache Software Foundation" - * + * * @scr.property name="sling.servlet.prefix" * value="-1" * @scr.property name="sling.servlet.resourceTypes" @@ -36,5 +35,5 @@ package org.apache.sling.launchpad.tests */ @SuppressWarnings("serial") -public class PrefixServletMinusOne extends TestServlet { +public class PrefixServletMinusOne extends TestServlet { } \ No newline at end of file Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.servlets; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,16 +14,17 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.servlets; /** Example/test Sling Servlet using a prefix to demonstrate how * PrefixServletZero overrides PrefixServletMinusOne - * + * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Servlet" - * + * * @scr.property name="service.description" value="Default Query Servlet" * @scr.property name="service.vendor" value="The Apache Software Foundation" - * + * * @scr.property name="sling.servlet.prefix" * value="0" * @scr.property name="sling.servlet.resourceTypes" @@ -36,5 +35,5 @@ package org.apache.sling.launchpad.tests */ @SuppressWarnings("serial") -public class PrefixServletZero extends TestServlet { +public class PrefixServletZero extends TestServlet { } \ No newline at end of file Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java Wed Jan 19 17:00:24 2011 @@ -1,12 +1,3 @@ -package org.apache.sling.launchpad.testservices.servlets; - -import java.io.IOException; - -import javax.servlet.ServletException; - -import org.apache.sling.api.SlingHttpServletRequest; -import org.apache.sling.api.SlingHttpServletResponse; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,19 +14,27 @@ import org.apache.sling.api.SlingHttpSer * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.servlets; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; /** Example/test Sling Servlet registered for the PUT method * on a specific resource type - * + * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Servlet" - * + * * @scr.property name="service.description" value="Default Query Servlet" * @scr.property name="service.vendor" value="The Apache Software Foundation" - * + * * @scr.property name="sling.servlet.resourceTypes" * value="LAUNCHPAD_TEST_ResourceType" - * + * * @scr.property name="sling.servlet.methods" * value = "PUT" */ @@ -44,7 +43,7 @@ import org.apache.sling.api.SlingHttpSer public class PutMethodServlet extends TestServlet { @Override - protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) + protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { dumpRequestAsProperties(request, response); } Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java?rev=1060865&r1=1060864&r2=1060865&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java Wed Jan 19 17:00:24 2011 @@ -1,5 +1,3 @@ -package org.apache.sling.launchpad.testservices.servlets; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,27 +14,28 @@ package org.apache.sling.launchpad.tests * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.sling.launchpad.testservices.servlets; /** Example/test Sling Servlet registered with two selectors - * + * * @scr.component immediate="true" metatype="no" * @scr.service interface="javax.servlet.Servlet" - * + * * @scr.property name="service.description" value="Default Query Servlet" * @scr.property name="service.vendor" value="The Apache Software Foundation" - * + * * Register this servlet for the default resource type and two selectors: * @scr.property name="sling.servlet.resourceTypes" * value="sling/servlet/default" - * + * * @scr.property name="sling.servlet.selectors" * values.1 = "TEST_SEL_1" * values.2 = "TEST_SEL_2" - * + * * @scr.property name="sling.servlet.extensions" * value = "txt" */ @SuppressWarnings("serial") -public class SelectorServlet extends TestServlet { +public class SelectorServlet extends TestServlet { } \ No newline at end of file