Return-Path: 
 <commits-return-1111-apmail-zest-commits-archive=zest.apache.org@zest.apache.org>
X-Original-To: apmail-zest-commits-archive@minotaur.apache.org
Delivered-To: apmail-zest-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B703817E0E
	for <apmail-zest-commits-archive@minotaur.apache.org>;
 Tue, 29 Sep 2015 15:03:57 +0000 (UTC)
Received: (qmail 23757 invoked by uid 500); 29 Sep 2015 15:03:57 -0000
Delivered-To: apmail-zest-commits-archive@zest.apache.org
Received: (qmail 23737 invoked by uid 500); 29 Sep 2015 15:03:57 -0000
Mailing-List: contact commits-help@zest.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zest.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zest.apache.org>
List-Post: <mailto:commits@zest.apache.org>
List-Id: <commits.zest.apache.org>
Reply-To: dev@zest.apache.org
Delivered-To: mailing list commits@zest.apache.org
Received: (qmail 23728 invoked by uid 99); 29 Sep 2015 15:03:57 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Sep 2015 15:03:57 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 461D2DFCCE; Tue, 29 Sep 2015 15:03:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: paulmerlin@apache.org
To: commits@zest.apache.org
Message-Id: <934725fb860f4486a709e0c264a48b76@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: zest-java git commit: ZEST-127 Fix Servlets assembly DSL for 2.x
 style usage
Date: Tue, 29 Sep 2015 15:03:57 +0000 (UTC)

Repository: zest-java
Updated Branches:
  refs/heads/support/2.1 d3a44ed89 -> 3f0633de7


ZEST-127 Fix Servlets assembly DSL for 2.x style usage

Cherry-picked from 6b7650a9127a91c871343dce728d54c8d03734b5


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3f0633de
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3f0633de
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3f0633de

Branch: refs/heads/support/2.1
Commit: 3f0633de7c1ce811de43fe94703b125faa235176
Parents: d3a44ed
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Tue Sep 29 16:59:54 2015 +0200
Committer: Paul Merlin <paul@nosphere.org>
Committed: Tue Sep 29 17:03:15 2015 +0200

----------------------------------------------------------------------
 .../java/org/qi4j/library/http/Servlets.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f0633de/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java b/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java
index 9b4bb28..00c8399 100644
--- a/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java
+++ b/libraries/http/src/main/java/org/qi4j/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.qi4j.api.service.ServiceComposite;
 import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.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;
         }