You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2015/09/29 17:00:09 UTC
zest-java git commit: ZEST-127 Fix Servlets assembly DSL for 2.x
style usage
Repository: zest-java
Updated Branches:
refs/heads/develop 9c3c0dcbe -> 6b7650a91
ZEST-127 Fix Servlets assembly DSL for 2.x style usage
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/6b7650a9
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/6b7650a9
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/6b7650a9
Branch: refs/heads/develop
Commit: 6b7650a9127a91c871343dce728d54c8d03734b5
Parents: 9c3c0dc
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Sep 29 16:59:54 2015 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Sep 29 16:59:54 2015 +0200
----------------------------------------------------------------------
.../org/apache/zest/library/http/Servlets.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6b7650a9/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java b/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
index c161393..d97c75c 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
@@ -26,7 +26,6 @@ import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.Servlet;
import javax.servlet.ServletContextListener;
-import org.apache.zest.api.service.ServiceComposite;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.library.http.ConstraintInfo.Constraint;
@@ -77,17 +76,17 @@ public final class Servlets
public static class ContextListenerDeclaration
{
- Class<? extends ServiceComposite> contextListener;
+ Class<? extends ServletContextListener> contextListener;
Map<String, String> initParams = Collections.emptyMap();
- public <T extends ServletContextListener & ServiceComposite> ContextListenerDeclaration with( Class<T> contextListener )
+ public <T extends ServletContextListener> ContextListenerDeclaration with( Class<T> contextListener )
{
this.contextListener = contextListener;
return this;
}
- public Class<? extends ServiceComposite> contextListener()
+ public Class<? extends ServletContextListener> contextListener()
{
return contextListener;
}
@@ -142,7 +141,7 @@ public final class Servlets
String path;
- Class<? extends ServiceComposite> servlet;
+ Class<? extends Servlet> servlet;
Map<String, String> initParams = Collections.emptyMap();
@@ -151,7 +150,7 @@ public final class Servlets
this.path = path;
}
- public <T extends Servlet & ServiceComposite> ServletDeclaration with( Class<T> servlet )
+ public <T extends Servlet> ServletDeclaration with( Class<T> servlet )
{
this.servlet = servlet;
return this;
@@ -163,7 +162,7 @@ public final class Servlets
return this;
}
- Class<? extends ServiceComposite> servlet()
+ Class<? extends Servlet> servlet()
{
return servlet;
}
@@ -213,7 +212,7 @@ public final class Servlets
String path;
- Class<? extends ServiceComposite> filter;
+ Class<? extends Filter> filter;
EnumSet<DispatcherType> dispatchers;
@@ -224,7 +223,7 @@ public final class Servlets
this.path = path;
}
- public <T extends Filter & ServiceComposite> FilterAssembler through(
+ public <T extends Filter> FilterAssembler through(
Class<T> filter )
{
this.filter = filter;
@@ -261,7 +260,7 @@ public final class Servlets
return this;
}
- Class<? extends ServiceComposite> filter()
+ Class<? extends Filter> filter()
{
return filter;
}