4:51 p.m.
Author: lincolnthree
Date: 2010-04-22 17:51:21 -0400 (Thu, 22 Apr 2010)
New Revision: 12588
Added:
modules/faces/branches/lincolnthree/
modules/faces/branches/lincolnthree/pom.xml
Removed:
modules/faces/branches/lincolnthree/pom.xml
Modified:
modules/faces/branches/lincolnthree/src/main/java/org/jboss/seam/faces/environment/SeamApplicationWrapper.java
Log:
* Branching for Lincoln
Copied: modules/faces/branches/lincolnthree (from rev 12583,
modules/faces/tags/3.0.0.Alpha1/impl)
Deleted: modules/faces/branches/lincolnthree/pom.xml
===================================================================
--- modules/faces/tags/3.0.0.Alpha1/impl/pom.xml 2010-04-22 21:42:16 UTC (rev 12583)
+++ modules/faces/branches/lincolnthree/pom.xml 2010-04-22 21:51:21 UTC (rev 12588)
@@ -1,46 +0,0 @@
-<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>
- <artifactId>seam-faces-parent</artifactId>
- <groupId>org.jboss.seam.faces</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>seam-faces</artifactId>
- <version>3.0.0-SNAPSHOT</version>
-
- <packaging>jar</packaging>
- <name>Seam Faces Module Core Implementation</name>
-
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <artifactId>seam-faces-api</artifactId>
- <groupId>org.jboss.seam.faces</groupId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: modules/faces/branches/lincolnthree/pom.xml (from rev 12586,
modules/faces/tags/3.0.0.Alpha1/impl/pom.xml)
===================================================================
--- modules/faces/branches/lincolnthree/pom.xml (rev 0)
+++ modules/faces/branches/lincolnthree/pom.xml 2010-04-22 21:51:21 UTC (rev 12588)
@@ -0,0 +1,46 @@
+<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>
+ <artifactId>seam-faces-parent</artifactId>
+ <groupId>org.jboss.seam.faces</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>seam-faces</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+
+ <packaging>jar</packaging>
+ <name>Seam Faces Module Core Implementation</name>
+
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <artifactId>seam-faces-api</artifactId>
+ <groupId>org.jboss.seam.faces</groupId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified:
modules/faces/branches/lincolnthree/src/main/java/org/jboss/seam/faces/environment/SeamApplicationWrapper.java
===================================================================
---
modules/faces/tags/3.0.0.Alpha1/impl/src/main/java/org/jboss/seam/faces/environment/SeamApplicationWrapper.java 2010-04-22
21:42:16 UTC (rev 12583)
+++
modules/faces/branches/lincolnthree/src/main/java/org/jboss/seam/faces/environment/SeamApplicationWrapper.java 2010-04-22
21:51:21 UTC (rev 12588)
@@ -22,13 +22,8 @@
package org.jboss.seam.faces.environment;
-import java.util.Set;
-
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
@@ -38,11 +33,11 @@
import javax.faces.validator.Validator;
import javax.inject.Inject;
-import org.jboss.seam.faces.event.PhaseEventBridge;
+import org.jboss.seam.faces.util.BeanManagerUtils;
/**
- * Provides @{@link Inject} support for JSF artifacts such as {@link Converter},
- * {@link Validator}.
+ * Provides contextual lifecycle and @{link Inject} support for JSF artifacts
+ * such as {@link Converter}, {@link Validator}.
*
* @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter,
III</a>
*
@@ -53,7 +48,7 @@
private Application parent;
@Inject
- BeanManager manager;
+ BeanManagerUtils managerUtils;
public void installWrapper(@Observes final PostConstructApplicationEvent event)
{
@@ -65,67 +60,33 @@
@Override
public Converter createConverter(final Class<?> targetClass)
{
- Converter result = null;
-
- Set<Bean<?>> beans = manager.getBeans(targetClass);
- if (!beans.isEmpty())
+ Converter result = parent.createConverter(targetClass);
+ if (result != null)
{
- Bean<?> bean = beans.iterator().next();
- CreationalContext<?> context = manager.createCreationalContext(bean);
- result = (Converter) manager.getReference(bean, PhaseEventBridge.class,
context);
+ result = managerUtils.getContextualInstance(result.getClass());
}
-
- if (result == null)
- {
- result = parent.createConverter(targetClass);
- }
-
return result;
}
@Override
public Converter createConverter(final String converterId)
{
- /*
- * We need to ask for an instance because we have no way of getting the
- * type information by id
- */
Converter result = parent.createConverter(converterId);
if (result != null)
{
- Class<? extends Converter> targetClass = result.getClass();
- Set<Bean<?>> beans = manager.getBeans(targetClass);
- if (!beans.isEmpty())
- {
- Bean<?> bean = beans.iterator().next();
- CreationalContext<?> context = manager.createCreationalContext(bean);
- result = (Converter) manager.getReference(bean, targetClass, context);
- }
+ result = managerUtils.getContextualInstance(result.getClass());
}
-
return result;
}
@Override
public Validator createValidator(final String validatorId)
{
- /*
- * We need to ask for an instance because we have no way of getting the
- * type information by id
- */
Validator result = parent.createValidator(validatorId);
if (result != null)
{
- Class<? extends Validator> targetClass = result.getClass();
- Set<Bean<?>> beans = manager.getBeans(targetClass);
- if (!beans.isEmpty())
- {
- Bean<?> bean = beans.iterator().next();
- CreationalContext<?> context = manager.createCreationalContext(bean);
- result = (Validator) manager.getReference(bean, targetClass, context);
- }
+ result = managerUtils.getContextualInstance(result.getClass());
}
-
return result;
}