You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/09/20 16:04:50 UTC
svn commit: r1173156 - in /myfaces/extensions/cdi/trunk/component-support-modules: trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/ trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/

Author: gpetracek
Date: Tue Sep 20 14:04:50 2011
New Revision: 1173156

URL: http://svn.apache.org/viewvc?rev=1173156&view=rev
Log:
EXTCDI-186 support module for trinidad2

Added:
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2RenderKitWrapperFactory.java
      - copied, changed from r1172504, myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java
Removed:
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java
Modified:
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapper.java
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java

Modified: myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapper.java?rev=1173156&r1=1173155&r2=1173156&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapper.java Tue Sep 20 14:04:50 2011
@@ -23,6 +23,7 @@ import org.apache.myfaces.trinidad.rende
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
 import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.InterceptedResponseWriter;
 
+import javax.enterprise.inject.Typed;
 import javax.faces.render.RenderKit;
 import javax.faces.render.Renderer;
 import javax.faces.render.ResponseStateManager;
@@ -39,6 +40,7 @@ import java.io.OutputStream;
 /**
  * @author Gerhard Petracek
  */
+@Typed()
 class TrinidadRenderKitWrapper extends RenderKit
                                implements Service.Provider, DialogRenderKitService, ExtendedRenderKitService
 {

Copied: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2RenderKitWrapperFactory.java (from r1172504, myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2RenderKitWrapperFactory.java?p2=myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2RenderKitWrapperFactory.java&p1=myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java&r1=1172504&r2=1173156&rev=1173156&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2RenderKitWrapperFactory.java Tue Sep 20 14:04:50 2011
@@ -18,19 +18,22 @@
  */
 package org.apache.myfaces.extensions.cdi.trinidad2.impl;
 
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.RenderKitWrapperFactory;
+import org.apache.myfaces.extensions.cdi.trinidad.impl.TrinidadRenderKitWrapperFactory;
 
+import javax.enterprise.inject.Specializes;
 import javax.faces.render.RenderKit;
 import javax.inject.Singleton;
 
 @Singleton
-public class TrinidadRenderKitWrapperFactory implements RenderKitWrapperFactory
+@Specializes
+public class Trinidad2RenderKitWrapperFactory extends TrinidadRenderKitWrapperFactory
 {
     private static final long serialVersionUID = -1182925270780281194L;
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public RenderKit create(RenderKit renderKit)
     {
         return new TrinidadRenderKitWrapper(renderKit);

Modified: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java?rev=1173156&r1=1173155&r2=1173156&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java Tue Sep 20 14:04:50 2011
@@ -23,6 +23,7 @@ import org.apache.myfaces.trinidad.rende
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
 import org.apache.myfaces.trinidad.util.Service;
 
+import javax.enterprise.inject.Typed;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
@@ -38,6 +39,7 @@ import java.io.Writer;
 import java.util.Iterator;
 import java.util.Map;
 
+@Typed()
 class TrinidadRenderKitWrapper extends RenderKit
         implements Service.Provider, DialogRenderKitService, ExtendedRenderKitService
 {