You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2019/06/13 13:00:02 UTC
[sling-org-apache-sling-servlets-resolver] branch master updated
(aa77c2e -> ab5dc4f)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git.
from aa77c2e SLING-8470 : Improve servlets handling
new af342bb Clean up code: remove unused imports
new ab5dc4f SLING-8489 : Move embedded engine class to servlets resolver package space
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 23 ++++++++++++++++++++++
.../resource/ServletResourceProviderFactory.java | 21 ++++++++++----------
.../ServletResourceProviderCreateTest.java | 5 +++--
3 files changed, 36 insertions(+), 13 deletions(-)
[sling-org-apache-sling-servlets-resolver] 02/02: SLING-8489 : Move
embedded engine class to servlets resolver package space
Posted by cz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit ab5dc4f7fd1c2d549a0b00286ec29ee8baf11287
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 13 14:59:53 2019 +0200
SLING-8489 : Move embedded engine class to servlets resolver package space
---
pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4f95d60..fa33629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,29 @@
</excludePackageNames>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createSourcesJar>true</createSourcesJar>
+ <shadeSourcesContent>true</shadeSourcesContent>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.sling.engine.impl.request</pattern>
+ <shadedPattern>org.apache.sling.servlets.resolver.internal.engine</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
[sling-org-apache-sling-servlets-resolver] 01/02: Clean up code:
remove unused imports
Posted by cz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit af342bb5e129fd3535fa12621a5cb81f6fde1687
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 4 11:06:23 2019 +0200
Clean up code: remove unused imports
---
.../resource/ServletResourceProviderFactory.java | 21 ++++++++++-----------
.../resource/ServletResourceProviderCreateTest.java | 5 +++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
index 2c43174..e4f6995 100644
--- a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
+++ b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
@@ -18,6 +18,16 @@
*/
package org.apache.sling.servlets.resolver.internal.resource;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_METHODS;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_NAME;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PATHS;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PREFIX;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_RESOURCE_SUPER_TYPE;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
+import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_SELECTORS;
+import static org.osgi.service.component.ComponentConstants.COMPONENT_NAME;
+
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -27,7 +37,6 @@ import javax.servlet.Servlet;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.servlets.HttpConstants;
-import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -35,16 +44,6 @@ import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_METHODS;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_NAME;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PATHS;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PREFIX;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_RESOURCE_SUPER_TYPE;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
-import static org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_SELECTORS;
-import static org.osgi.service.component.ComponentConstants.COMPONENT_NAME;
-
public class ServletResourceProviderFactory {
/**
diff --git a/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java b/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
index a4881de..a1c25e5 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
@@ -35,11 +35,9 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.servlets.HttpConstants;
import org.apache.sling.api.servlets.ServletResolverConstants;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.junit.Test;
-import org.mockito.Mock;
import org.mockito.Mockito;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -188,6 +186,7 @@ public class ServletResourceProviderCreateTest {
@Test
public void testCreateWithResourceSuperType() {
+ @SuppressWarnings("unchecked")
final ServiceReference<Servlet> msr = Mockito.mock(ServiceReference.class);
Mockito.when(msr.getProperty(Constants.SERVICE_ID)).thenReturn(1L);
Mockito.when(msr.getProperty(ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES)).thenReturn(RES_TYPE);
@@ -199,12 +198,14 @@ public class ServletResourceProviderCreateTest {
assertEquals(2, paths.size());
assertTrue(paths.contains(ROOT + RES_TYPE_PATH));
assertTrue(paths.contains(ROOT + RES_TYPE_PATH + "/html" + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION));
+ @SuppressWarnings("unchecked")
Resource superTypeMarkingResource = srp.getResource(Mockito.mock(ResolveContext.class), "/apps/sling/sample",
Mockito.mock(ResourceContext.class), Mockito.mock(Resource.class));
assertNotNull(superTypeMarkingResource);
assertEquals("this/is/a/test", superTypeMarkingResource.getResourceSuperType());
assertNull(superTypeMarkingResource.adaptTo(Servlet.class));
+ @SuppressWarnings("unchecked")
Resource servletResource = srp.getResource(Mockito.mock(ResolveContext.class), "/apps/sling/sample/html.servlet",
Mockito.mock(ResourceContext.class), Mockito.mock(Resource.class));
assertNotNull(servletResource);