This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-annotations-it.git
commit 28b8b20cf3418ebd7cd954ec41e9148745d37108 Author: Konrad Windszus <[email protected]> AuthorDate: Sun May 13 12:10:15 2018 +0200 SLING-7624 initial IT for servlet annotations --- .gitignore | 4 + LICENSE | 202 +++++++++++++++++++++ README.md | 3 + bnd.bnd | 1 + pom.xml | 186 +++++++++++++++++++ .../annotations/testservlets/PathBoundServlet.java | 43 +++++ .../testservlets/PathBoundServletWithPrefix.java | 43 +++++ .../testservlets/ResourceTypeBoundServlet.java | 48 +++++ .../ResourceTypeBoundServletWithExtension.java | 48 +++++ .../ResourceTypeBoundServletWithMethods.java | 58 ++++++ .../ResourceTypeBoundServletWithPrefix.java | 48 +++++ .../ResourceTypeBoundServletWithSelectors.java | 48 +++++ .../SLING-CONTENT/content/servlettest.json | 3 + .../servlettest/resourceTypeBoundServlet.json | 4 + .../resourceTypeBoundServletWithExtension.json | 4 + .../resourceTypeBoundServletWithMethods.json | 4 + .../resourceTypeBoundServletWithPrefix.json | 4 + .../resourceTypeBoundServletWithSelectors.json | 4 + .../annotations/ServletRegistrationIT.java | 139 ++++++++++++++ src/test/provisioning/model.txt | 29 +++ 20 files changed, 923 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c06d21 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +/.project +/.settings/ +/.classpath \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..5b42e90 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Apache Sling Servlet Annotations IT + +This module is part of the [Apache Sling](https://sling.apache.org) project. diff --git a/bnd.bnd b/bnd.bnd new file mode 100644 index 0000000..bedec37 --- /dev/null +++ b/bnd.bnd @@ -0,0 +1 @@ +Sling-Initial-Content: SLING-CONTENT/content/servlettest;overwrite:=true;path:=/content/servlettest \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..706a963 --- /dev/null +++ b/pom.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>33</version> + <relativePath/> + </parent> + + <artifactId>sling-org-apache-sling-servlets-annotations-it</artifactId> + <version>1.0.0-SNAPSHOT</version> + + <name>Apache Sling Servlets Annotations IT</name> + <description> + Integration tests for OSGi DS 1.4 component property type annotations for Sling servlets and filters + </description> + + <scm> + <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-annotations-it.git</connection> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-annotations-it.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-annotations-it.git</url> + <tag>HEAD</tag> + </scm> + + <!-- compile with java 7 --> + <properties> + <sling.java.version>8</sling.java.version> + <http.host>localhost</http.host> + <!-- start with -DkeepITServerRunning=true to allow to rerun ITs or inspect the server after the ITs have been executed there --> + <keepITServerRunning>false</keepITServerRunning> + </properties> + + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + <version>4.0.0</version> + </plugin> + <plugin> + <!-- Find free ports to run our server --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>reserve-server-port</id> + <goals> + <goal>reserve-network-port</goal> + </goals> + <phase>pre-integration-test</phase> + <configuration> + <portNames> + <!-- used port name must be stored in property because it must be used for the base url --> + <portName>http.port</portName> + </portNames> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <!-- the Sling instance is provisioned from the model in src/main/provisioning/model.txt --> + <groupId>org.apache.sling</groupId> + <artifactId>slingstart-maven-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>start-container-before-IT</id> + <goals> + <goal>start</goal> + </goals> + <configuration> + <launchpadDependency> + <artifactId>org.apache.sling.launchpad</artifactId> + <groupId>org.apache.sling</groupId> + <version>9</version> + </launchpadDependency> + </configuration> + </execution> + <execution> + <id>stop-container-after-IT</id> + <goals> + <goal>stop</goal> + </goals> + <configuration> + <shouldBlockUntilKeyIsPressed>${keepITServerRunning}</shouldBlockUntilKeyIsPressed> + </configuration> + </execution> + </executions> + <configuration> + <servers> + <!-- this configuration applies to both 'start' and 'stop' --> + <server> + <id>singleinstance</id> + <port>${http.port}</port> + <vmOpts>${sling.vm.options}</vmOpts> + <stdOutFile>sling/logs/stdout.log</stdOutFile> + </server> + </servers> + <!-- this configuration only applies to 'prepare-package' and 'package' --> + <!-- <disableExtendingMavenClasspath>true</disableExtendingMavenClasspath> --> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <systemPropertyVariables> + <baseUrl>http://${http.host}:${http.port}/</baseUrl> + <bundleFile>${project.build.directory}/${project.build.finalName}.jar</bundleFile> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.3.0</version><!-- to be compliant with DS 1.3 --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.api</artifactId> + <!-- https://issues.apache.org/jira/browse/SLING-6327 --> + <version>2.16.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>sling-org-apache-sling-servlets-annotations</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + + <!-- testing dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.rules</artifactId> + <version>1.0.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project> diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java new file mode 100644 index 0000000..c8d2e41 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java @@ -0,0 +1,43 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingSafeMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByPath; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByPath(sling_servlet_paths="/bin/PathBoundServlet") +public class PathBoundServlet extends SlingSafeMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java new file mode 100644 index 0000000..25ca646 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java @@ -0,0 +1,43 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingSafeMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByPath; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByPath(sling_servlet_paths="PathBoundServletWithPrefix", sling_servlet_prefix="/bin") +public class PathBoundServletWithPrefix extends SlingSafeMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java new file mode 100644 index 0000000..a2bb695 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java @@ -0,0 +1,48 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByResourceType; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByResourceType(sling_servlet_resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServlet") +public class ResourceTypeBoundServlet extends SlingAllMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java new file mode 100644 index 0000000..ed87218 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java @@ -0,0 +1,48 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByResourceType; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByResourceType(sling_servlet_resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithExtension", sling_servlet_extensions= {"ext1", "ext2"}) +public class ResourceTypeBoundServletWithExtension extends SlingAllMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java new file mode 100644 index 0000000..285c627 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java @@ -0,0 +1,58 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.ServletResolverConstants; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByResourceType; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class, property = { + ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=/apps/sling/testservlets/ResourceTypeBoundServletWithMethods", + ServletResolverConstants.SLING_SERVLET_METHODS + "=PUT", + ServletResolverConstants.SLING_SERVLET_METHODS + "=POST" + }) +@SlingServletByResourceType(sling_servlet_resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithMethods", sling_servlet_methods= {"PUT", "POST"}) +public class ResourceTypeBoundServletWithMethods extends SlingAllMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java new file mode 100644 index 0000000..9e293a7 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java @@ -0,0 +1,48 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByResourceType; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByResourceType(sling_servlet_resourceTypes="ResourceTypeBoundServletWithPrefix", sling_servlet_prefix="/apps/sling/testservlets") +public class ResourceTypeBoundServletWithPrefix extends SlingAllMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java new file mode 100644 index 0000000..a79dd60 --- /dev/null +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java @@ -0,0 +1,48 @@ +/* + * 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.servlets.annotations.testservlets; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletByResourceType; +import org.osgi.service.component.annotations.Component; + +@Component(service=Servlet.class) +@SlingServletByResourceType(sling_servlet_resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithSelectors", sling_servlet_selectors= {"selector1.selector2", "selector3"}) +public class ResourceTypeBoundServletWithSelectors extends SlingAllMethodsServlet { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } + + @Override + protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + response.setStatus(555); + } +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest.json b/src/main/resources/SLING-CONTENT/content/servlettest.json new file mode 100644 index 0000000..225e5ce --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest.json @@ -0,0 +1,3 @@ +{ + "jcr:primaryType" : "sling:Folder" +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServlet.json b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServlet.json new file mode 100644 index 0000000..49c8187 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServlet.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "/apps/sling/testservlets/ResourceTypeBoundServlet" +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithExtension.json b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithExtension.json new file mode 100644 index 0000000..98562bb --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithExtension.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "/apps/sling/testservlets/ResourceTypeBoundServletWithExtension" +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithMethods.json b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithMethods.json new file mode 100644 index 0000000..2d7bf22 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithMethods.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "/apps/sling/testservlets/ResourceTypeBoundServletWithMethods" +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithPrefix.json b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithPrefix.json new file mode 100644 index 0000000..d77f7ed --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithPrefix.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "/apps/sling/testservlets/ResourceTypeBoundServletWithPrefix" +} diff --git a/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithSelectors.json b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithSelectors.json new file mode 100644 index 0000000..9853c98 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/content/servlettest/resourceTypeBoundServletWithSelectors.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "/apps/sling/testservlets/ResourceTypeBoundServletWithSelectors" +} diff --git a/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java b/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java new file mode 100644 index 0000000..172cc1a --- /dev/null +++ b/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java @@ -0,0 +1,139 @@ +/* + * 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.servlets.annotations; + +import java.io.File; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.apache.http.entity.StringEntity; +import org.apache.sling.testing.clients.ClientException; +import org.apache.sling.testing.clients.osgi.OsgiConsoleClient; +import org.apache.sling.testing.junit.rules.SlingRule; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + +public class ServletRegistrationIT { + + @Rule + public SlingRule methodRule = new SlingRule(); + + public static OsgiConsoleClient CLIENT; + + private static final String BUNDLE_SYMBOLICNAME = "sling-org-apache-sling-servlets-annotations-it"; + private static final long BUNDLE_START_TIMEOUT = TimeUnit.SECONDS.toMillis(10); + private static final long SERVICE_START_TIMEOUT = TimeUnit.SECONDS.toMillis(60); + + @BeforeClass + public static void setupOnce() throws ClientException, InterruptedException, TimeoutException, URISyntaxException { + String baseUrl = System.getProperty("baseUrl"); + if (baseUrl == null) { + throw new IllegalArgumentException("IT must be started with environment variable 'baseUrl' set"); + } + URI url = new URI(baseUrl); + CLIENT = new OsgiConsoleClient(url, "admin", "admin"); + + String bundleFile = System.getProperty("bundleFile"); + if (bundleFile == null) { + throw new IllegalArgumentException("IT must be started with environment variable 'bundleFile' set"); + } + // deploy bundle to server + File file = new File(bundleFile); + if (!file.exists()) { + throw new IllegalArgumentException("Test bundle file in " + file + " does not exist!"); + } + CLIENT.waitInstallBundle(file, true, -1, BUNDLE_START_TIMEOUT, 500); + // wait until the server is fully started + CLIENT.waitExists("/index.html", SERVICE_START_TIMEOUT, 500); + + CLIENT.waitServiceRegistered("javax.servlet.Servlet", BUNDLE_SYMBOLICNAME, SERVICE_START_TIMEOUT, 500); + } + + @AfterClass + public static void tearDownOnce() throws ClientException { + //CLIENT.uninstallBundle(BUNDLE_SYMBOLICNAME); + } + + @Test + public void testPathBoundServlet() throws ClientException { + CLIENT.doGet("/bin/PathBoundServlet", 555); + CLIENT.doGet("/bin/PathBoundServlet.with.some.selector.and.extension", 555); + } + + @Test + @Ignore("Prefix is ignored!") + public void testPathBoundServletWithPrefix() throws ClientException { + CLIENT.doGet("/bin/PathBoundServletWithPrefix", 555); + } + + @Test + public void testResourceTypeBoundServlet() throws ClientException, UnsupportedEncodingException { + CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet", 555); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.html", 555); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.json", 555); + // only GET and HEAD are supposed to be working + CLIENT.doPut("/content/servlettest/resourceTypeBoundServlet.json", new StringEntity("some text"), Collections.emptyList(), 201); + } + + @Test + @Ignore("Prefix is not working somehow") + public void testResourceTypeBoundServletWithPrefix() throws ClientException, UnsupportedEncodingException { + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix", 403); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.html", 555); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.json", 555); + // only GET and HEAD are supposed to be working + CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithPrefix.json", new StringEntity("some text"), Collections.emptyList(), 201); + } + + @Test + public void testResourceTypeBoundServletWithExtension() throws ClientException, UnsupportedEncodingException { + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension", 403); // without extension is a index listing, which is forbidden by default + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.html", 200); // DEFAULT GET Servlet + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext1", 555); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", 555); + // only GET and HEAD are supposed to be working + CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", new StringEntity("some text"), Collections.emptyList(), 201); + } + + @Test + public void testResourceTypeBoundServletWithSelectors() throws ClientException, UnsupportedEncodingException { + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.someext", 404); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.someext", 404); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector3.someext", 555); + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someext", 555); + // some non-registered selector as first selector + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.someotherselector.selector1.selector2.someext", 404); + // some non-registered selector as last selector + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someotherselector.someext", 555); + // only GET and HEAD are supposed to be working + CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithSelectors.selector3.someext", new StringEntity("some text"), Collections.emptyList(), 201); + } + + @Test + public void testResourceTypeBoundServletWithMethods() throws ClientException, UnsupportedEncodingException { + CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithMethods.someext", 404); // DEFAULT Get not triggered due to weird extension + CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 555); + CLIENT.doPost("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 555); + } +} diff --git a/src/test/provisioning/model.txt b/src/test/provisioning/model.txt new file mode 100644 index 0000000..d2ea981 --- /dev/null +++ b/src/test/provisioning/model.txt @@ -0,0 +1,29 @@ +# +# 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. +# +# This model is not actually used, it is only necessary due to https://issues.apache.org/jira/browse/SLING-7662 + +[feature name=models.validation-impl.it] +# Dependencies +[artifacts] + org.apache.sling/org.apache.sling.launchpad/9/slingstart + # this is necessary to execute the tests + org.apache.sling/org.apache.sling.junit.core/1.0.26 + +[settings] + org.apache.sling.commons.log.julenabled=true -- To stop receiving notification emails like this one, please contact [email protected].
