You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/05/19 22:22:17 UTC
svn commit: r946372 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main: config/
java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/
resources/META-INF/ resources/META-INF/services/
Author: struberg
Date: Wed May 19 20:22:17 2010
New Revision: 946372
URL: http://svn.apache.org/viewvc?rev=946372&view=rev
Log:
EXTCDI-22 improve ProjectStageProducer
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/Jsf2ProjectStageProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/config/beans.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/config/javax.enterprise.inject.spi.Extension
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/Jsf2ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/Jsf2ProjectStageProducer.java?rev=946372&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/Jsf2ProjectStageProducer.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/projectstage/Jsf2ProjectStageProducer.java Wed May 19 20:22:17 2010
@@ -0,0 +1,70 @@
+/*
+ * 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.javaee.jsf.impl.projectstage;
+
+import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
+import org.apache.myfaces.extensions.cdi.core.impl.projectstage.ProjectStageProducer;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * This is a JSF-2 specific version of the {@link ProjectStageProducer}.
+ * In addition to it's parent class, it will first try to pickup the
+ * JSF ProjectStage from the Application. If this returns the JSF
+ * {@link javax.faces.application.ProjectStage.Production}, we'll go on
+ * and try to figure out our own EXTCDI
+ * {@link org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage}s
+ * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ */
+public class Jsf2ProjectStageProducer extends ProjectStageProducer
+{
+
+ @Override
+ protected ProjectStage determineCustomProjectStage()
+ {
+ ProjectStage codiProjectStage = null;
+
+ javax.faces.application.ProjectStage jsfProjectStage =
+ FacesContext.getCurrentInstance().getApplication().getProjectStage();
+
+ if (jsfProjectStage != null)
+ {
+ // so we need to match them to our CODI ProjectStages.
+ switch(jsfProjectStage)
+ {
+ case UnitTest:
+ codiProjectStage = ProjectStage.UnitTest;
+ break;
+
+ case Development:
+ codiProjectStage = ProjectStage.Development;
+ break;
+
+ case SystemTest:
+ codiProjectStage = ProjectStage.SystemTest;
+ break;
+
+ default:
+ // we cannot match others, so codiProjectStage remains null in the default case
+ }
+ }
+
+ return codiProjectStage;
+ }
+}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml?rev=946372&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml Wed May 19 20:22:17 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+ <interceptors>
+ <class>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.phase.ViewControllerInterceptor</class>
+ </interceptors>
+</beans>
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=946372&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Wed May 19 20:22:17 2010
@@ -0,0 +1,18 @@
+#####################################################################################
+# 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.
+#####################################################################################
\ No newline at end of file