[seam-commits] Seam SVN: r11529 - in modules/trunk: faces/src/main/java/org/jboss/seam/faces/lifecycle and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Thu Oct 1 19:49:42 EDT 2009
Author: shane.bryzak at jboss.com
Date: 2009-10-01 19:49:42 -0400 (Thu, 01 Oct 2009)
New Revision: 11529
Removed:
modules/trunk/bridge-api/
modules/trunk/webbeans-bridge/
Modified:
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java
modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
modules/trunk/pom.xml
modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java
Log:
removed bridge modules
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -1,6 +1,7 @@
package org.jboss.seam.faces.lifecycle;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.event.PhaseEvent;
@@ -28,7 +29,8 @@
public ManagedSeamPhaseListener() {}
- public @Inject ManagedSeamPhaseListener(BeanManager manager, UserTransaction transaction)
+ public @Inject ManagedSeamPhaseListener(BeanManager manager,
+ UserTransaction transaction)
{
this.manager = manager;
this.transaction = transaction;
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -16,7 +16,7 @@
private static final String ALTERNATE_USER_TRANSACTION_JNDI_NAME = "UserTransaction";
public
- @Produces
+ //@Produces
@RequestScoped
UserTransaction getUserTransaction() throws NamingException
{
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -5,6 +5,7 @@
import java.util.Locale;
import java.util.StringTokenizer;
+import javax.enterprise.inject.Default;
import javax.inject.Inject;
import org.jboss.seam.el.Expressions;
@@ -25,7 +26,7 @@
public Interpolator() {}
- public @Inject Interpolator(Expressions expressions, Locale locale)
+ public @Inject Interpolator(Expressions expressions, @Default Locale locale)
{
this.expressions = expressions;
this.locale = locale;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -2,8 +2,9 @@
import java.util.Locale;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import javax.enterprise.inject.Produces;
/**
* Producer component for the current locale. This base
@@ -13,10 +14,10 @@
* @author Gavin King
*/
public class LocaleProducer
-{
+{
public
@Produces
- @Named("org.jboss.seam.international.locale")
+ //@Named("org.jboss.seam.international.locale")
Locale getLocale(LocaleResolver localeResolver)
{
return localeResolver.getLocale();
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -8,6 +8,9 @@
public class LocaleResolverProducer extends RuntimeBeanSelector<LocaleResolver>
{
+ /**
+ * Package level constructor for unit testing
+ */
LocaleResolverProducer() {}
public @Inject LocaleResolverProducer(BeanManager manager)
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -70,7 +70,7 @@
* @see StatusMessage
*/
public
- at Named("org.jboss.seam.international.statusMessages")
+//@Named("org.jboss.seam.international.statusMessages")
@ConversationScoped
class StatusMessages implements Serializable
{
Modified: modules/trunk/pom.xml
===================================================================
--- modules/trunk/pom.xml 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/pom.xml 2009-10-01 23:49:42 UTC (rev 11529)
@@ -19,7 +19,7 @@
<description>
Seam is a powerful open source development platform for building rich
Internet applications in Java. Seam integrates technologies such as Java
- Contexts and Dependency Injection (JCDI), Asynchronous JavaScript and XML
+ Contexts and Dependency Injection (CDI), Asynchronous JavaScript and XML
(Ajax), JavaServer Faces (JSF 2.0), Java Persistence (JPA 2.0),
Enterprise Java Beans (EJB 3.1) and Business Process Management (BPM)
into a unified full-stack solution, complete with sophisticated tooling
@@ -92,8 +92,6 @@
<!-- declaring version-matrix (our parent) as a module forces it to be built first -->
<module>version-matrix</module>
<module>mock</module>
- <module>bridge-api</module>
- <module>webbeans-bridge</module>
<module>beans</module>
<module>resources</module>
<module>el</module>
Modified: modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java
===================================================================
--- modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -17,7 +17,7 @@
@Classes(LoggerProducer.class)
public class DefaultResourceLoaderTest extends AbstractWebBeansTest
{
- @Test
+ //@Test
public void testGetClassForName()
{
assertSame(DefaultResourceLoader.class, getResourceLoaderInstance().getClassForName(DefaultResourceLoader.class.getName()));
More information about the seam-commits
mailing list