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/05/17 15:50:16 UTC
svn commit: r1104250 [1/3] - in /myfaces/extensions/cdi/trunk: ./
alternative-modules/ alternative-modules/alternative-configuration-modules/
alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/
alternative-modul...
Author: gpetracek
Date: Tue May 17 13:50:12 2011
New Revision: 1104250
URL: http://svn.apache.org/viewvc?rev=1104250&view=rev
Log:
EXTCDI-177 and EXTCDI-185 optional property file based configuration and workaround for weld
Added:
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/pom.xml
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/myfaces-extcdi.properties
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/pom.xml
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/META-INF/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/META-INF/services/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/alternative/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/alternative/config/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/alternative/config/JsfModuleConfigTest.java
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/resources/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/resources/META-INF/
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/pom.xml
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/AlternativeCoreConfigImplStartupObserver.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfigProxy.java
- copied, changed from r1103962, myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfigProxy.java
- copied, changed from r1103962, myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfigProxy.java
- copied, changed from r1103962, myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/AlternativeJsfImplModuleConfigStartupObserver.java
myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfigProxy.java
- copied, changed from r1103962, myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ProxyUtils.java
- copied, changed from r1102975, myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ProxyUtils.java
myfaces/extensions/cdi/trunk/dist/alternative-configuration/
myfaces/extensions/cdi/trunk/dist/alternative-configuration-weld/
myfaces/extensions/cdi/trunk/dist/alternative-configuration-weld/README.txt
myfaces/extensions/cdi/trunk/dist/alternative-configuration-weld/pom.xml
myfaces/extensions/cdi/trunk/dist/alternative-configuration-weld/src/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/README.txt
myfaces/extensions/cdi/trunk/dist/alternative-configuration/pom.xml
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/config/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/config/AlternativeCodiCoreConfig.java
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/scope/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/scope/conversation/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/scope/conversation/config/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/scope/conversation/config/AlternativeConversationConfig.java
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/auto/scope/conversation/config/AlternativeWindowContextConfig.java
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/jsf/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/auto/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/auto/config/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/auto/config/AlternativeJsfModuleConfig.java
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/resources/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/resources/META-INF/
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/resources/META-INF/LICENSE.txt
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/resources/META-INF/NOTICE.txt
myfaces/extensions/cdi/trunk/dist/alternative-configuration/src/main/resources/META-INF/beans.xml
Removed:
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java
myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/alternative/config/JsfModuleConfigTest.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ProxyUtils.java
Modified:
myfaces/extensions/cdi/trunk/alternative-modules/core-alternative-module/src/main/resources/META-INF/beans.xml
myfaces/extensions/cdi/trunk/alternative-modules/jsf-alternative-module/src/main/resources/META-INF/beans.xml
myfaces/extensions/cdi/trunk/alternative-modules/pom.xml
myfaces/extensions/cdi/trunk/assembly/jsf12/pom.xml
myfaces/extensions/cdi/trunk/assembly/pom.xml
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.ConfiguredValueResolver
myfaces/extensions/cdi/trunk/core/impl/src/test/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.ConfiguredValueResolver
myfaces/extensions/cdi/trunk/core/impl/src/test/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.test.impl.config.TestInterface
myfaces/extensions/cdi/trunk/dist/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/ProjectStageObserver.java
myfaces/extensions/cdi/trunk/pom.xml
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/pom.xml?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/pom.xml (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/pom.xml Tue May 17 13:50:12 2011
@@ -0,0 +1,43 @@
+<?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>
+ <packaging>jar</packaging>
+
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-core-alternative-configuration</artifactId>
+
+ <name>MyFaces Extensions-CDI Core Alternative Config Module</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.myfaces.extensions.cdi</groupId>
+ <artifactId>alternative-configuration-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
+ <artifactId>myfaces-extcdi-core-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java Tue May 17 13:50:12 2011
@@ -0,0 +1,99 @@
+/*
+ * 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.core.alternative.config;
+
+import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+
+import javax.enterprise.inject.Typed;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class AlternativeCodiCoreConfig extends CodiCoreConfig
+{
+ private static final long serialVersionUID = -1471628272055334673L;
+
+ /**
+ * Logs the activation of the config
+ */
+ public AlternativeCodiCoreConfig()
+ {
+ String moduleVersion = detectModuleVersion();
+
+ StringBuilder info = new StringBuilder("[Started] MyFaces CODI (Extensions CDI) alternative config ");
+ info.append(getClass().getName());
+ info.append(" is active (");
+ info.append(moduleVersion);
+ info.append(")");
+ info.append(System.getProperty("line.separator"));
+
+ Logger logger = Logger.getLogger(getClass().getName());
+
+ if(logger.isLoggable(Level.INFO))
+ {
+ logger.info(info.toString());
+ }
+ }
+
+ private String detectModuleVersion()
+ {
+ String version = ClassUtils.getJarVersion(getClass());
+
+ if(version != null && !version.startsWith("null"))
+ {
+ return " v" + version;
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isAdvancedQualifierRequiredForDependencyInjection()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isAdvancedQualifierRequiredForDependencyInjection());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isConfigurationLoggingEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isConfigurationLoggingEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isInvalidBeanCreationEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isInvalidBeanCreationEventEnabled());
+ }
+}
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java Tue May 17 13:50:12 2011
@@ -0,0 +1,149 @@
+/*
+ * 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.core.alternative.scope.conversation.config;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.ConversationConfig;
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+
+import javax.enterprise.inject.Typed;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class AlternativeConversationConfig extends ConversationConfig
+{
+ private static final long serialVersionUID = 6346216228706018316L;
+
+ /**
+ * Logs the activation of the config
+ */
+ public AlternativeConversationConfig()
+ {
+ String moduleVersion = detectModuleVersion();
+
+ StringBuilder info = new StringBuilder("[Started] MyFaces CODI (Extensions CDI) alternative config ");
+ info.append(getClass().getName());
+ info.append(" is active (");
+ info.append(moduleVersion);
+ info.append(")");
+ info.append(System.getProperty("line.separator"));
+
+ Logger logger = Logger.getLogger(getClass().getName());
+
+ if(logger.isLoggable(Level.INFO))
+ {
+ logger.info(info.toString());
+ }
+ }
+
+ private String detectModuleVersion()
+ {
+ String version = ClassUtils.getJarVersion(getClass());
+
+ if(version != null && !version.startsWith("null"))
+ {
+ return " v" + version;
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int getConversationTimeoutInMinutes()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Integer.class,
+ super.getConversationTimeoutInMinutes());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isScopeBeanEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isScopeBeanEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isAccessBeanEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isAccessBeanEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isUnscopeBeanEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isUnscopeBeanEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isStartConversationEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isStartConversationEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCloseConversationEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isCloseConversationEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isRestartConversationEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isRestartConversationEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isConversationRequiredEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isConversationRequiredEnabled());
+ }
+}
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java Tue May 17 13:50:12 2011
@@ -0,0 +1,159 @@
+/*
+ * 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.core.alternative.scope.conversation.config;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.WindowContextConfig;
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+
+import javax.enterprise.inject.Typed;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class AlternativeWindowContextConfig extends WindowContextConfig
+{
+ private static final long serialVersionUID = 8616591700809645827L;
+
+ /**
+ * Logs the activation of the config
+ */
+ public AlternativeWindowContextConfig()
+ {
+ String moduleVersion = detectModuleVersion();
+
+ StringBuilder info = new StringBuilder("[Started] MyFaces CODI (Extensions CDI) alternative config ");
+ info.append(getClass().getName());
+ info.append(" is active (");
+ info.append(moduleVersion);
+ info.append(")");
+ info.append(System.getProperty("line.separator"));
+
+ Logger logger = Logger.getLogger(getClass().getName());
+
+ if(logger.isLoggable(Level.INFO))
+ {
+ logger.info(info.toString());
+ }
+ }
+
+ private String detectModuleVersion()
+ {
+ String version = ClassUtils.getJarVersion(getClass());
+
+ if(version != null && !version.startsWith("null"))
+ {
+ return " v" + version;
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isUrlParameterSupported()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isUrlParameterSupported());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isUnknownWindowIdsAllowed()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isUnknownWindowIdsAllowed());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isAddWindowIdToActionUrlsEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isAddWindowIdToActionUrlsEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int getWindowContextTimeoutInMinutes()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Integer.class,
+ super.getWindowContextTimeoutInMinutes());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int getMaxWindowContextCount()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Integer.class,
+ super.getMaxWindowContextCount());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCloseEmptyWindowContextsEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isCloseEmptyWindowContextsEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isEagerWindowContextDetectionEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isEagerWindowContextDetectionEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCreateWindowContextEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isCreateWindowContextEventEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCloseWindowContextEventEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isCloseWindowContextEventEnabled());
+ }
+}
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/LICENSE.txt Tue May 17 13:50:12 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/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/NOTICE.txt Tue May 17 13:50:12 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/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig Tue May 17 13:50:12 2011
@@ -0,0 +1,26 @@
+#####################################################################################
+# 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.
+#####################################################################################
+
+# this file is only useful for alternative-implementation modules (required for weld)
+# with owb or (hopefully) cdi 1.1 it's possible to configure the content of this file via
+# cdi std.-mechanisms (see @Alternative)
+
+org.apache.myfaces.extensions.cdi.core.alternative.config.AlternativeCodiCoreConfig
+org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config.AlternativeConversationConfig
+org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config.AlternativeWindowContextConfig
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/java/org/apache/myfaces/extensions/cdi/core/test/alternative/config/CoreConfigTest.java Tue May 17 13:50:12 2011
@@ -0,0 +1,75 @@
+/*
+ * 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.core.test.alternative.config;
+
+import org.apache.myfaces.extensions.cdi.core.alternative.config.AlternativeCodiCoreConfig;
+import org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config.AlternativeConversationConfig;
+import org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config.AlternativeWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.ConversationConfig;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.WindowContextConfig;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+public class CoreConfigTest
+{
+ @Test
+ public void testAlternativeCodiCoreConfig()
+ {
+ CodiCoreConfig codiCoreConfig = new AlternativeCodiCoreConfig();
+
+ //changed via config see myfaces-extcdi.properties
+ assertEquals(codiCoreConfig.isAdvancedQualifierRequiredForDependencyInjection(), false);
+
+ assertEquals(codiCoreConfig.isConfigurationLoggingEnabled(), true);
+ assertEquals(codiCoreConfig.isInvalidBeanCreationEventEnabled(), false);
+ }
+
+ @Test
+ public void testAlternativeConversationConfig()
+ {
+ ConversationConfig conversationConfig = new AlternativeConversationConfig();
+
+ assertEquals(conversationConfig.isConversationRequiredEnabled(), true);
+ assertEquals(conversationConfig.getConversationTimeoutInMinutes(), 30);
+ assertEquals(conversationConfig.isAccessBeanEventEnabled(), false);
+ assertEquals(conversationConfig.isCloseConversationEventEnabled(), false);
+ assertEquals(conversationConfig.isStartConversationEventEnabled(), false);
+ assertEquals(conversationConfig.isRestartConversationEventEnabled(), false);
+ assertEquals(conversationConfig.isScopeBeanEventEnabled(), false);
+ assertEquals(conversationConfig.isUnscopeBeanEventEnabled(), false);
+ }
+
+ @Test
+ public void testAlternativeWindowContextConfig()
+ {
+ WindowContextConfig windowContextConfig = new AlternativeWindowContextConfig();
+
+ assertEquals(windowContextConfig.getMaxWindowContextCount(), 64);
+ assertEquals(windowContextConfig.getWindowContextTimeoutInMinutes(), 60);
+ assertEquals(windowContextConfig.isUrlParameterSupported(), true);
+ assertEquals(windowContextConfig.isUnknownWindowIdsAllowed(), false);
+ assertEquals(windowContextConfig.isAddWindowIdToActionUrlsEnabled(), false);
+ assertEquals(windowContextConfig.isCloseEmptyWindowContextsEnabled(), false);
+ assertEquals(windowContextConfig.isEagerWindowContextDetectionEnabled(), true);
+ assertEquals(windowContextConfig.isCreateWindowContextEventEnabled(), false);
+ assertEquals(windowContextConfig.isCloseWindowContextEventEnabled(), false);
+ }
+}
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/LICENSE.txt Tue May 17 13:50:12 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/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/META-INF/NOTICE.txt Tue May 17 13:50:12 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/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/myfaces-extcdi.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/myfaces-extcdi.properties?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/myfaces-extcdi.properties (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/test/resources/myfaces-extcdi.properties Tue May 17 13:50:12 2011
@@ -0,0 +1 @@
+advanced_qualifier_required_for_dependency_injection=false
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/pom.xml?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/pom.xml (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/pom.xml Tue May 17 13:50:12 2011
@@ -0,0 +1,48 @@
+<?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>
+ <packaging>jar</packaging>
+
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf-alternative-configuration</artifactId>
+
+ <name>MyFaces Extensions-CDI JSF Alternative Config Module</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.myfaces.extensions.cdi</groupId>
+ <artifactId>alternative-configuration-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
+ <artifactId>myfaces-extcdi-core-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java?rev=1104250&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java (added)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java Tue May 17 13:50:12 2011
@@ -0,0 +1,109 @@
+/*
+ * 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.jsf.alternative.config;
+
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.JsfModuleConfig;
+
+import javax.enterprise.inject.Typed;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class AlternativeJsfModuleConfig extends JsfModuleConfig
+{
+ private static final long serialVersionUID = 2385134740850201120L;
+
+ /**
+ * Logs the activation of the config
+ */
+ public AlternativeJsfModuleConfig()
+ {
+ String moduleVersion = detectModuleVersion();
+
+ StringBuilder info = new StringBuilder("[Started] MyFaces CODI (Extensions CDI) alternative config ");
+ info.append(getClass().getName());
+ info.append(" is active (");
+ info.append(moduleVersion);
+ info.append(")");
+ info.append(System.getProperty("line.separator"));
+
+ Logger logger = Logger.getLogger(getClass().getName());
+
+ if(logger.isLoggable(Level.INFO))
+ {
+ logger.info(info.toString());
+ }
+ }
+
+ private String detectModuleVersion()
+ {
+ String version = ClassUtils.getJarVersion(getClass());
+
+ if(version != null && !version.startsWith("null"))
+ {
+ return " v" + version;
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isInitialRedirectEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isInitialRedirectEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isUseViewConfigsAsNavigationCasesEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isUseViewConfigsAsNavigationCasesEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isInvalidValueAwareMessageInterpolatorEnabled()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isInvalidValueAwareMessageInterpolatorEnabled());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isAlwaysKeepMessages()
+ {
+ return CodiUtils.lookupConfigFromEnvironment(null, Boolean.class,
+ super.isAlwaysKeepMessages());
+ }
+}