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 4f52e8c0d07b09d76f2b27c7dd5df2f9e1010ff4 Author: Konrad Windszus <[email protected]> AuthorDate: Fri May 25 16:26:05 2018 +0200 Revert "SLING-7624 use singular for methods accepting arrays" This reverts commit 0feb9dbc5ffebd7481b68a62ede42396b77ed0ae. --- .../servlets/annotations/testservlets/ResourceTypeBoundServlet.java | 2 +- .../annotations/testservlets/ResourceTypeBoundServletWithExtension.java | 2 +- .../annotations/testservlets/ResourceTypeBoundServletWithMethods.java | 2 +- .../annotations/testservlets/ResourceTypeBoundServletWithPrefix.java | 2 +- .../annotations/testservlets/ResourceTypeBoundServletWithSelectors.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 index 782c022..412ff1f 100644 --- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java @@ -28,7 +28,7 @@ import org.apache.sling.servlets.annotations.SlingServletResourceTypes; import org.osgi.service.component.annotations.Component; @Component(service=Servlet.class) -@SlingServletResourceTypes(resourceType="/apps/sling/testservlets/ResourceTypeBoundServlet") +@SlingServletResourceTypes(resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServlet") public class ResourceTypeBoundServlet extends SlingAllMethodsServlet { /** 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 index 47ca6fb..3e02bc5 100644 --- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java @@ -28,7 +28,7 @@ import org.apache.sling.servlets.annotations.SlingServletResourceTypes; import org.osgi.service.component.annotations.Component; @Component(service=Servlet.class) -@SlingServletResourceTypes(resourceType="/apps/sling/testservlets/ResourceTypeBoundServletWithExtension", extension= {"ext1", "ext2"}) +@SlingServletResourceTypes(resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithExtension", extensions= {"ext1", "ext2"}) public class ResourceTypeBoundServletWithExtension extends SlingAllMethodsServlet { /** 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 index 93d28f6..6a37056 100644 --- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java @@ -28,7 +28,7 @@ import org.apache.sling.servlets.annotations.SlingServletResourceTypes; import org.osgi.service.component.annotations.Component; @Component(service=Servlet.class) -@SlingServletResourceTypes(resourceType="/apps/sling/testservlets/ResourceTypeBoundServletWithMethods", method= {"PUT", "POST"}) +@SlingServletResourceTypes(resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithMethods", methods= {"PUT", "POST"}) public class ResourceTypeBoundServletWithMethods extends SlingAllMethodsServlet { /** 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 index 145e113..454b61b 100644 --- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java @@ -30,7 +30,7 @@ import org.osgi.service.component.annotations.Component; @Component(service=Servlet.class) @SlingServletPrefix("/apps/sling/testservlets/") -@SlingServletResourceTypes(resourceType="ResourceTypeBoundServletWithPrefix") +@SlingServletResourceTypes(resourceTypes="ResourceTypeBoundServletWithPrefix") public class ResourceTypeBoundServletWithPrefix extends SlingAllMethodsServlet { /** 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 index 52b038d..7a3b02a 100644 --- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java +++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java @@ -28,7 +28,7 @@ import org.apache.sling.servlets.annotations.SlingServletResourceTypes; import org.osgi.service.component.annotations.Component; @Component(service=Servlet.class) -@SlingServletResourceTypes(resourceType="/apps/sling/testservlets/ResourceTypeBoundServletWithSelectors", selector= {"selector1.selector2", "selector3"}) +@SlingServletResourceTypes(resourceTypes="/apps/sling/testservlets/ResourceTypeBoundServletWithSelectors", selectors= {"selector1.selector2", "selector3"}) public class ResourceTypeBoundServletWithSelectors extends SlingAllMethodsServlet { /** -- To stop receiving notification emails like this one, please contact [email protected].
