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/18 16:11:17 UTC
svn commit: r1172289 - in /myfaces/extensions/cdi/trunk: ./
component-support-modules/
component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/
component-support-modules/trinidad20-support/ component-sup...
Author: gpetracek
Date: Sun Sep 18 14:11:16 2011
New Revision: 1172289
URL: http://svn.apache.org/viewvc?rev=1172289&view=rev
Log:
EXTCDI-186 support module for trinidad2 - thx to Rudy De Busscher
Added:
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/pom.xml
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2SupportModuleStartupObserver.java
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/beans.xml
Modified:
myfaces/extensions/cdi/trunk/component-support-modules/pom.xml
myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java
myfaces/extensions/cdi/trunk/pom.xml
Modified: myfaces/extensions/cdi/trunk/component-support-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/pom.xml?rev=1172289&r1=1172288&r2=1172289&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/pom.xml Sun Sep 18 14:11:16 2011
@@ -35,6 +35,7 @@
<modules>
<module>trinidad-support</module>
+ <module>trinidad20-support</module>
</modules>
</project>
Modified: myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.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/TrinidadSupportModuleStartupObserver.java?rev=1172289&r1=1172288&r2=1172289&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java Sun Sep 18 14:11:16 2011
@@ -48,7 +48,7 @@ public class TrinidadSupportModuleStartu
String moduleVersion = detectModuleVersion();
//module info
- StringBuilder info = new StringBuilder("[Started] MyFaces CODI Trinidad-Support-Module");
+ StringBuilder info = new StringBuilder("[Started] MyFaces CODI " + getModuleName());
info.append(moduleVersion);
info.append(separator);
@@ -65,7 +65,7 @@ public class TrinidadSupportModuleStartu
protected String detectModuleVersion()
{
- String version = ClassUtils.getJarVersion(TrinidadSupportModuleStartupObserver.class);
+ String version = ClassUtils.getJarVersion(getClass());
if(version != null && !version.startsWith("null"))
{
@@ -73,4 +73,13 @@ public class TrinidadSupportModuleStartu
}
return "";
}
+
+ /**
+ * Provides the name of the module
+ * @return name of the module
+ */
+ protected String getModuleName()
+ {
+ return "Trinidad-Support-Module";
+ }
}
Added: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/pom.xml?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/pom.xml (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/pom.xml Sun Sep 18 14:11:16 2011
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.myfaces.extensions.cdi.modules.component-support</groupId>
+ <artifactId>component-support-modules-project</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.myfaces.extensions.cdi.modules.component-support</groupId>
+ <artifactId>myfaces-extcdi-trinidad20-support</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+
+ <name>MyFaces Extensions-CDI Trinidad 2 Support Module</name>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules.component-support</groupId>
+ <artifactId>myfaces-extcdi-trinidad12-support</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${trinidad2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <createSourcesJar>true</createSourcesJar>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.extensions.cdi.modules.component-support:myfaces-extcdi-trinidad12-support</include>
+ </includes>
+ </artifactSet>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ </transformers>
+ </configuration>
+
+ <!--
+ Not used here, but maven needs to have the same dependencies
+ for the same plugin across the whole project, otherwise
+ the class loading (in this case for transformer implementations)
+ will not work properly (why ever...)
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi</groupId>
+ <artifactId>myfaces-extcdi-maven-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- override apache-release profile for custom javadoc configuration -->
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- overrides attach-javadocs from apache-parent -->
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceExcludes>
+ <!-- exclude org.apache.geronimo.specs artifacts -->
+ <dependencySourceExclude>org.apache.geronimo.specs:*</dependencySourceExclude>
+ <dependencySourceExclude>org.apache.myfaces.core:*</dependencySourceExclude>
+ </dependencySourceExcludes>
+
+ <excludePackageNames>org.apache.myfaces.extensions.cdi.core.*:org.apache.myfaces.extensions.cdi.message.*</excludePackageNames>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2SupportModuleStartupObserver.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/Trinidad2SupportModuleStartupObserver.java?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2SupportModuleStartupObserver.java (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/Trinidad2SupportModuleStartupObserver.java Sun Sep 18 14:11:16 2011
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.trinidad2.impl;
+
+import org.apache.myfaces.extensions.cdi.trinidad.impl.TrinidadSupportModuleStartupObserver;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Specializes;
+
+@Specializes
+@ApplicationScoped
+public class Trinidad2SupportModuleStartupObserver extends TrinidadSupportModuleStartupObserver
+{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected String getModuleName()
+ {
+ return "Trinidad2-Support-Module";
+ }
+}
Added: 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=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapper.java Sun Sep 18 14:11:16 2011
@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.trinidad2.impl;
+
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.InterceptedResponseWriter;
+import org.apache.myfaces.trinidad.render.DialogRenderKitService;
+import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
+import org.apache.myfaces.trinidad.util.Service;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseStream;
+import javax.faces.context.ResponseWriter;
+import javax.faces.render.ClientBehaviorRenderer;
+import javax.faces.render.RenderKit;
+import javax.faces.render.Renderer;
+import javax.faces.render.ResponseStateManager;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Map;
+
+class TrinidadRenderKitWrapper extends RenderKit
+ implements Service.Provider, DialogRenderKitService, ExtendedRenderKitService
+{
+ private RenderKit wrapped;
+
+ /**
+ * Constructor for wrapping the given {@link RenderKit}
+ *
+ * @param wrapped render-kit which should be wrapped
+ */
+ public TrinidadRenderKitWrapper(RenderKit wrapped)
+ {
+ this.wrapped = wrapped;
+ }
+
+ /**
+ * Wraps the {@link ResponseWriter} with a special wrapper which adds
+ * {@link org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.WindowContextIdHolderComponent}
+ * at the beginning.
+ * {@inheritDoc}
+ */
+ public ResponseWriter createResponseWriter(Writer writer, String s, String s1)
+ {
+ ResponseWriter responseWriter = wrapped.createResponseWriter(writer, s, s1);
+
+ if (responseWriter == null)
+ {
+ return null;
+ }
+
+ return new InterceptedResponseWriter(responseWriter);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T> T getService(Class<T> tClass)
+ {
+ if (this.wrapped instanceof Service.Provider)
+ {
+ return ((Service.Provider) this.wrapped).getService(tClass);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean launchDialog(FacesContext facesContext,
+ UIViewRoot uiViewRoot,
+ UIComponent uiComponent,
+ Map<String, Object> processParameters,
+ boolean useWindow,
+ Map<String, Object> windowProperties)
+ {
+ if (this.wrapped instanceof DialogRenderKitService)
+ {
+ return ((DialogRenderKitService) this.wrapped).launchDialog(facesContext,
+ uiViewRoot,
+ uiComponent,
+ processParameters,
+ useWindow,
+ windowProperties);
+ }
+
+ //TODO logging
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean returnFromDialog(FacesContext facesContext, Object returnValue)
+ {
+ if (this.wrapped instanceof DialogRenderKitService)
+ {
+ return ((DialogRenderKitService) this.wrapped).returnFromDialog(facesContext, returnValue);
+ }
+
+ //TODO logging
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isReturning(FacesContext facesContext, UIComponent source)
+ {
+ if (this.wrapped instanceof DialogRenderKitService)
+ {
+ return ((DialogRenderKitService) this.wrapped).returnFromDialog(facesContext, source);
+ }
+
+ //TODO logging
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addScript(FacesContext facesContext, String s)
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).addScript(facesContext, s);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void encodeScripts(FacesContext facesContext) throws IOException
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).encodeScripts(facesContext);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean shortCircuitRenderView(FacesContext facesContext) throws IOException
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).shortCircuitRenderView(facesContext);
+ }
+
+ //TODO logging
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isStateless(FacesContext facesContext)
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).isStateless(facesContext);
+ }
+
+ //TODO logging
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void encodeBegin(FacesContext facesContext) throws IOException
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).encodeBegin(facesContext);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void encodeEnd(FacesContext facesContext) throws IOException
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).encodeEnd(facesContext);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void encodeFinally(FacesContext facesContext)
+ {
+ if (this.wrapped instanceof ExtendedRenderKitService)
+ {
+ ((ExtendedRenderKitService) this.wrapped).encodeFinally(facesContext);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addRenderer(String s, String s1, Renderer renderer)
+ {
+ this.wrapped.addRenderer(s, s1, renderer);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Renderer getRenderer(String s, String s1)
+ {
+ return this.wrapped.getRenderer(s, s1);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ResponseStateManager getResponseStateManager()
+ {
+ return this.wrapped.getResponseStateManager();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ResponseStream createResponseStream(OutputStream outputStream)
+ {
+ return this.wrapped.createResponseStream(outputStream);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addClientBehaviorRenderer(String type, ClientBehaviorRenderer renderer)
+ {
+ wrapped.addClientBehaviorRenderer(type, renderer);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ClientBehaviorRenderer getClientBehaviorRenderer(String type)
+ {
+ return wrapped.getClientBehaviorRenderer(type);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterator<String> getClientBehaviorRendererTypes()
+ {
+ return wrapped.getClientBehaviorRendererTypes();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterator<String> getComponentFamilies()
+ {
+ return wrapped.getComponentFamilies();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterator<String> getRendererTypes(String componentFamily)
+ {
+ return wrapped.getRendererTypes(componentFamily);
+ }
+}
\ No newline at end of file
Added: 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/TrinidadRenderKitWrapperFactory.java?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad2/impl/TrinidadRenderKitWrapperFactory.java Sun Sep 18 14:11:16 2011
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.trinidad2.impl;
+
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.RenderKitWrapperFactory;
+
+import javax.faces.render.RenderKit;
+import javax.inject.Singleton;
+
+@Singleton
+public class TrinidadRenderKitWrapperFactory implements RenderKitWrapperFactory
+{
+ private static final long serialVersionUID = -1182925270780281194L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public RenderKit create(RenderKit renderKit)
+ {
+ return new TrinidadRenderKitWrapper(renderKit);
+ }
+}
Added: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/LICENSE.txt?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/LICENSE.txt (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/LICENSE.txt Sun Sep 18 14:11:16 2011
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/NOTICE.txt?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/NOTICE.txt (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/NOTICE.txt Sun Sep 18 14:11:16 2011
@@ -0,0 +1,9 @@
+Apache MyFaces Extensions CDI (aka MyFaces CODI)
+Copyright 2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+------------------------------------------------------------------------
+See the file LICENSE.txt
+------------------------------------------------------------------------
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/beans.xml?rev=1172289&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad20-support/src/main/resources/META-INF/beans.xml Sun Sep 18 14:11:16 2011
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>
Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1172289&r1=1172288&r2=1172289&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Sun Sep 18 14:11:16 2011
@@ -101,6 +101,7 @@
<mojarra1.version>1.2_14</mojarra1.version>
<trinidad1.version>1.2.12</trinidad1.version>
+ <trinidad2.version>2.0.0</trinidad2.version>
<maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
</properties>