Seam SVN: r12824 - in modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml: model and 1 other directory.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-05-26 17:41:38 -0400 (Wed, 26 May 2010)
New Revision: 12824
Modified:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
Log:
minor refactoring
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-05-26 21:41:00 UTC (rev 12823)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-05-26 21:41:38 UTC (rev 12824)
@@ -25,11 +25,11 @@
public class BeanResult<X>
{
- AnnotatedTypeBuilder<X> builder;
- Class<X> type;
- BeanResultType beanType = BeanResultType.ADD;
+ final AnnotatedTypeBuilder<X> builder;
+ final Class<X> type;
+ final BeanResultType beanType;
- public BeanResult(Class<X> type, boolean readAnnotations)
+ public BeanResult(Class<X> type, boolean readAnnotations, BeanResultType beanType)
{
this.type = type;
builder = AnnotatedTypeBuilder.newInstance(type);
@@ -37,6 +37,7 @@
{
builder.readAnnotationsFromUnderlyingType();
}
+ this.beanType = beanType;
}
public AnnotatedTypeBuilder<X> getBuilder()
@@ -54,9 +55,4 @@
return beanType;
}
- public void setBeanType(BeanResultType beanType)
- {
- this.beanType = beanType;
- }
-
}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-05-26 21:41:00 UTC (rev 12823)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-05-26 21:41:38 UTC (rev 12824)
@@ -305,27 +305,27 @@
{
boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty();
boolean extend = !rb.getChildrenOfType(SpecializesXmlItem.class).isEmpty();
-
- // if it is an extend we want to read the annotations from the underlying
- // class
- BeanResult<?> result = new BeanResult(rb.getJavaClass(), extend);
- AnnotatedTypeBuilder<?> type = result.getBuilder();
- // list of constructor arguments
- List<ParameterXmlItem> constList = new ArrayList<ParameterXmlItem>();
-
+ BeanResultType beanType = BeanResultType.ADD;
if (override && extend)
{
throw new XmlConfigurationException("A bean may not both <override> and <extend> an existing bean", rb.getDocument(), rb.getLineno());
}
if (override)
{
- result.setBeanType(BeanResultType.OVERRIDE);
+ beanType = BeanResultType.OVERRIDE;
}
else if (extend)
{
- result.setBeanType(BeanResultType.SPECIALISE);
+ beanType = BeanResultType.SPECIALISE;
}
+ // if it is an extend we want to read the annotations from the underlying
+ // class
+ BeanResult<?> result = new BeanResult(rb.getJavaClass(), extend, beanType);
+ AnnotatedTypeBuilder<?> type = result.getBuilder();
+ // list of constructor arguments
+ List<ParameterXmlItem> constList = new ArrayList<ParameterXmlItem>();
+
for (AnnotationXmlItem item : rb.getChildrenOfType(AnnotationXmlItem.class))
{
Annotation a = createAnnotation(item);
15 years, 11 months
Seam SVN: r12823 - modules/xml/trunk.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-05-26 17:41:00 -0400 (Wed, 26 May 2010)
New Revision: 12823
Modified:
modules/xml/trunk/pom.xml
Log:
SEAMXML-6
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-05-26 21:39:47 UTC (rev 12822)
+++ modules/xml/trunk/pom.xml 2010-05-26 21:41:00 UTC (rev 12823)
@@ -28,6 +28,7 @@
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
+ <finalName>seam-xml-config-${pom.version}</finalName>
</configuration>
</plugin>
</plugins>
15 years, 11 months
Seam SVN: r12822 - in modules/drools/trunk: src and 2 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 17:39:47 -0400 (Wed, 26 May 2010)
New Revision: 12822
Added:
modules/drools/trunk/src/
modules/drools/trunk/src/main/
modules/drools/trunk/src/main/assembly/
modules/drools/trunk/src/main/assembly/assembly.xml
Removed:
modules/drools/trunk/assembly.xml
Modified:
modules/drools/trunk/pom.xml
Log:
default location for assembly.xml
Deleted: modules/drools/trunk/assembly.xml
===================================================================
--- modules/drools/trunk/assembly.xml 2010-05-26 21:37:18 UTC (rev 12821)
+++ modules/drools/trunk/assembly.xml 2010-05-26 21:39:47 UTC (rev 12822)
@@ -1,69 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>core/target/site/apidocs</directory>
- <outputDirectory>seam-drools/doc/api</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>examples</directory>
- <outputDirectory>seam-drools/examples</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <!-- <include>seamspace/pom.xml</include>
- <include>seamspace/src/**</include> -->
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>.</directory>
- <outputDirectory>seam-drools</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>lgpl.txt</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>core/src/main/java</directory>
- <outputDirectory>seam-drools/source</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.seam.drools:seam-drools-core:jar</include>
- </includes>
- <binaries>
- <outputDirectory>seam-drools/lib</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>org.jboss.seam.drools:seam-drools-reference-guide</include>
- </includes>
- <binaries>
- <outputDirectory>seam-drools/doc/reference</outputDirectory>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
-
- </moduleSets>
-</assembly>
Modified: modules/drools/trunk/pom.xml
===================================================================
--- modules/drools/trunk/pom.xml 2010-05-26 21:37:18 UTC (rev 12821)
+++ modules/drools/trunk/pom.xml 2010-05-26 21:39:47 UTC (rev 12822)
@@ -43,10 +43,9 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
- <descriptor>assembly.xml</descriptor>
+ <descriptor>src/main/assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Copied: modules/drools/trunk/src/main/assembly/assembly.xml (from rev 12749, modules/drools/trunk/assembly.xml)
===================================================================
--- modules/drools/trunk/src/main/assembly/assembly.xml (rev 0)
+++ modules/drools/trunk/src/main/assembly/assembly.xml 2010-05-26 21:39:47 UTC (rev 12822)
@@ -0,0 +1,69 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>core/target/site/apidocs</directory>
+ <outputDirectory>seam-drools/doc/api</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>examples</directory>
+ <outputDirectory>seam-drools/examples</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <!-- <include>seamspace/pom.xml</include>
+ <include>seamspace/src/**</include> -->
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>seam-drools</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>core/src/main/java</directory>
+ <outputDirectory>seam-drools/source</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.drools:seam-drools-core:jar</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-drools/lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.drools:seam-drools-reference-guide</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-drools/doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+
+ </moduleSets>
+</assembly>
15 years, 11 months
Seam SVN: r12821 - modules/xml/trunk/examples/princess-rescue.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 17:37:18 -0400 (Wed, 26 May 2010)
New Revision: 12821
Modified:
modules/xml/trunk/examples/princess-rescue/pom.xml
Log:
maven-eclipse-plugin is not recommended
Modified: modules/xml/trunk/examples/princess-rescue/pom.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-26 21:36:42 UTC (rev 12820)
+++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-26 21:37:18 UTC (rev 12821)
@@ -123,17 +123,6 @@
<finalName>princess-rescue</finalName>
<plugins>
- <!-- Eclipse plugin - download source and JavaDoc jars automatically -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
-
<!-- Embedded Jetty (jetty:run) -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
15 years, 11 months
Seam SVN: r12820 - modules/xml/trunk/examples/princess-rescue.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 17:36:42 -0400 (Wed, 26 May 2010)
New Revision: 12820
Modified:
modules/xml/trunk/examples/princess-rescue/pom.xml
Log:
1.5 is the default for all Seam
Modified: modules/xml/trunk/examples/princess-rescue/pom.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-26 21:29:48 UTC (rev 12819)
+++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-26 21:36:42 UTC (rev 12820)
@@ -122,15 +122,6 @@
<build>
<finalName>princess-rescue</finalName>
<plugins>
- <!-- Compiler plugin enforces Java 1.5 compatibility -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
<!-- Eclipse plugin - download source and JavaDoc jars automatically -->
<plugin>
15 years, 11 months
Seam SVN: r12819 - modules/xml/trunk.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-05-26 17:29:48 -0400 (Wed, 26 May 2010)
New Revision: 12819
Modified:
modules/xml/trunk/assembly.xml
modules/xml/trunk/distribution.txt
Log:
updated distribution files
Modified: modules/xml/trunk/assembly.xml
===================================================================
--- modules/xml/trunk/assembly.xml 2010-05-26 19:41:42 UTC (rev 12818)
+++ modules/xml/trunk/assembly.xml 2010-05-26 21:29:48 UTC (rev 12819)
@@ -50,7 +50,7 @@
<outputDirectory>seam-xml/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.weld:weld-extensions</include>
+ <include>org.jboss.weld:weld-extensions:jar</include>
</includes>
</dependencySet>
</dependencySets>
@@ -58,7 +58,7 @@
<moduleSets>
<moduleSet>
<includes>
- <include>org.jboss.seam.xml:seam-xml-impl:jar</include>
+ <include>org.jboss.seam.xml:seam-xml-config:jar</include>
</includes>
<binaries>
<outputDirectory>seam-xml/lib</outputDirectory>
@@ -68,7 +68,7 @@
<moduleSet>
<includes>
- <include>org.jboss.seam.xml:seam-xml-reference-guide</include>
+ <include>org.jboss.seam.xml:seam-xml-config-reference-guide</include>
</includes>
<binaries>
<outputDirectory>seam-xml/doc/reference</outputDirectory>
Modified: modules/xml/trunk/distribution.txt
===================================================================
--- modules/xml/trunk/distribution.txt 2010-05-26 19:41:42 UTC (rev 12818)
+++ modules/xml/trunk/distribution.txt 2010-05-26 21:29:48 UTC (rev 12819)
@@ -1,4 +1,3 @@
To create the Seam XML distribution, run the following Maven command:
-mvn clean package assembly:assembly
-
+mvn clean package javadoc:javadoc assembly:assembly
15 years, 11 months
Seam SVN: r12818 - in modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces: event and 1 other directories.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-05-26 15:41:42 -0400 (Wed, 26 May 2010)
New Revision: 12818
Added:
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBase.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java
Modified:
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java
Log:
Added MessagesAdapterTest - still need to figure out how to check the end state of the MockFacesContext.
Added: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBase.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBase.java (rev 0)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBase.java 2010-05-26 19:41:42 UTC (rev 12818)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.faces;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.inject.Inject;
+
+import org.jboss.seam.faces.event.PhaseEventBridge;
+import org.jboss.test.faces.mock.context.MockFacesContext;
+import org.jboss.test.faces.mock.lifecycle.MockLifecycle;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+public class PhaseTestBase
+{
+ @Inject
+ PhaseEventBridge phaseEventBridge;
+
+ protected final MockFacesContext facesContext = new MockFacesContext();
+ protected final MockLifecycle lifecycle = new MockLifecycle();
+
+ static List<PhaseId> ALL_PHASES = new ArrayList<PhaseId>()
+ {
+ private static final long serialVersionUID = 1L;
+
+ {
+ add(PhaseId.APPLY_REQUEST_VALUES);
+ add(PhaseId.INVOKE_APPLICATION);
+ add(PhaseId.PROCESS_VALIDATIONS);
+ add(PhaseId.RENDER_RESPONSE);
+ add(PhaseId.RESTORE_VIEW);
+ add(PhaseId.UPDATE_MODEL_VALUES);
+ }
+ };
+
+ protected void fireAllPhases()
+ {
+ fireAllBeforePhases();
+ fireAllAfterPhases();
+ }
+
+ protected void fireAllBeforePhases()
+ {
+ fireBeforePhases(ALL_PHASES);
+ }
+
+ protected void fireBeforePhases(final List<PhaseId> phases)
+ {
+ for (PhaseId phaseId : phases)
+ {
+ fireBeforePhase(phaseId);
+ }
+ }
+
+ protected void fireBeforePhase(final PhaseId phaseId)
+ {
+ phaseEventBridge.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle));
+ }
+
+ protected void fireAllAfterPhases()
+ {
+ fireAfterPhases(ALL_PHASES);
+ }
+
+ protected void fireAfterPhases(final List<PhaseId> phases)
+ {
+ for (PhaseId phaseId : phases)
+ {
+ fireAfterPhase(phaseId);
+ }
+ }
+
+ protected void fireAfterPhase(final PhaseId phaseId)
+ {
+ phaseEventBridge.afterPhase(new PhaseEvent(facesContext, phaseId, lifecycle));
+ }
+}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-05-26 18:44:38 UTC (rev 12817)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-05-26 19:41:42 UTC (rev 12818)
@@ -21,22 +21,17 @@
*/
package org.jboss.seam.faces.event;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.faces.PhaseTestBase;
import org.jboss.seam.faces.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.jboss.test.faces.mock.context.MockFacesContext;
-import org.jboss.test.faces.mock.lifecycle.MockLifecycle;
import org.jboss.weld.extensions.beanManager.BeanManagerAware;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,22 +42,9 @@
*
*/
@RunWith(Arquillian.class)
-public class PhaseEventBridgeTest
+public class PhaseEventBridgeTest extends PhaseTestBase
{
- private static List<PhaseId> ALL_PHASES = new ArrayList<PhaseId>()
- {
- private static final long serialVersionUID = 1L;
- {
- add(PhaseId.APPLY_REQUEST_VALUES);
- add(PhaseId.INVOKE_APPLICATION);
- add(PhaseId.PROCESS_VALIDATIONS);
- add(PhaseId.RENDER_RESPONSE);
- add(PhaseId.RESTORE_VIEW);
- add(PhaseId.UPDATE_MODEL_VALUES);
- }
- };
-
@Deployment
public static JavaArchive createTestArchive()
{
@@ -70,55 +52,8 @@
}
@Inject
- PhaseEventBridge phaseEventBridge;
- @Inject
MockPhaseEventObserver observer;
- private final MockFacesContext facesContext = new MockFacesContext();
- private final MockLifecycle lifecycle = new MockLifecycle();
-
- private void fireAllPhases()
- {
- fireAllBeforePhases();
- fireAllAfterPhases();
- }
-
- private void fireAllBeforePhases()
- {
- fireBeforePhases(ALL_PHASES);
- }
-
- private void fireBeforePhases(final List<PhaseId> phases)
- {
- for (PhaseId phaseId : phases)
- {
- fireBeforePhase(phaseId);
- }
- }
-
- private void fireBeforePhase(final PhaseId phaseId)
- {
- phaseEventBridge.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle));
- }
-
- private void fireAllAfterPhases()
- {
- fireAfterPhases(ALL_PHASES);
- }
-
- private void fireAfterPhases(final List<PhaseId> phases)
- {
- for (PhaseId phaseId : phases)
- {
- fireAfterPhase(phaseId);
- }
- }
-
- private void fireAfterPhase(final PhaseId phaseId)
- {
- phaseEventBridge.afterPhase(new PhaseEvent(facesContext, phaseId, lifecycle));
- }
-
@Test
public void testBeforeRenderResponseObserver()
{
Added: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java (rev 0)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/MessagesAdapterTest.java 2010-05-26 19:41:42 UTC (rev 12818)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.faces.status;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import javax.faces.event.PhaseId;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.faces.MockLogger;
+import org.jboss.seam.faces.PhaseTestBase;
+import org.jboss.seam.faces.event.PhaseEventBridge;
+import org.jboss.seam.international.status.Bundles;
+import org.jboss.seam.international.status.MessageFactory;
+import org.jboss.seam.international.status.Messages;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+(a)RunWith(Arquillian.class)
+public class MessagesAdapterTest extends PhaseTestBase
+{
+ @Deployment
+ public static JavaArchive createTestArchive()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesAdapter.class, Messages.class, MessageFactory.class, Bundles.class, PhaseEventBridge.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ }
+
+ @Inject
+ Messages messages;
+
+ @Test
+ public void testBeforeRenderResponseObserver()
+ {
+ messages.add(messages.info("Hey! This is a message"));
+ assertEquals(1, messages.getAll().size());
+
+ fireBeforePhase(PhaseId.RENDER_RESPONSE);
+
+ assertTrue(messages.getAll().isEmpty());
+ // assertNotNull(facesContext.getMessages());
+ }
+
+}
15 years, 11 months
Seam SVN: r12817 - in modules/faces/trunk: impl and 1 other directory.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-05-26 14:44:38 -0400 (Wed, 26 May 2010)
New Revision: 12817
Modified:
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/pom.xml
Log:
dependent on seam-international-api in parent; make seam-international an impl dependency only
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-05-26 18:30:46 UTC (rev 12816)
+++ modules/faces/trunk/impl/pom.xml 2010-05-26 18:44:38 UTC (rev 12817)
@@ -43,6 +43,11 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam.international</groupId>
+ <artifactId>seam-international</artifactId>
+ <version>${seam.i18n.version}</version>
+ </dependency>
</dependencies>
<profiles>
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-05-26 18:30:46 UTC (rev 12816)
+++ modules/faces/trunk/pom.xml 2010-05-26 18:44:38 UTC (rev 12817)
@@ -67,7 +67,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.seam.international</groupId>
- <artifactId>seam-international</artifactId>
+ <artifactId>seam-international-api</artifactId>
<version>${seam.i18n.version}</version>
</dependency>
15 years, 11 months
Seam SVN: r12816 - modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-05-26 14:30:46 -0400 (Wed, 26 May 2010)
New Revision: 12816
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
Log:
Fixed potential for null values in AnnotationLiteral instances, which should never have null member variables.
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-05-26 14:49:09 UTC (rev 12815)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-05-26 18:30:46 UTC (rev 12816)
@@ -80,7 +80,7 @@
beanManager.fireEvent(payload, qualifiers);
}
- private Annotation[] getQualifiers(SystemEvent e)
+ private Annotation[] getQualifiers(final SystemEvent e)
{
if (isViewEvent(e))
{
@@ -98,38 +98,47 @@
}
}
- private boolean isViewEvent(SystemEvent e)
+ private boolean isViewEvent(final SystemEvent e)
{
return (e instanceof PreRenderViewEvent) || (e instanceof PostConstructViewMapEvent) || (e instanceof PreDestroyViewMapEvent);
}
private class ComponentLiteral extends AnnotationLiteral<Component> implements Component
{
- private final String value;
+ private static final long serialVersionUID = -180390717920002323L;
+ private String value = "";
+
public String value()
{
return value;
}
- public ComponentLiteral(String value)
+ public ComponentLiteral(final String value)
{
- this.value = value;
+ if (value != null)
+ {
+ this.value = value;
+ }
}
}
private class ViewLiteral extends AnnotationLiteral<View> implements View
{
- private final String value;
+ private static final long serialVersionUID = -9101103836360031181L;
+ private String value = "";
public String value()
{
return value;
}
- public ViewLiteral(String value)
+ public ViewLiteral(final String value)
{
- this.value = value;
+ if (value != null)
+ {
+ this.value = value;
+ }
}
}
15 years, 11 months
Seam SVN: r12815 - in modules/faces/trunk: api/src/main/java/org/jboss/seam/faces/qualifier and 1 other directories.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-05-26 10:49:09 -0400 (Wed, 26 May 2010)
New Revision: 12815
Added:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/qualifier/
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/qualifier/Faces.java
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
Log:
Added the concept of a @Faces qualifier in order to mark when a given CDI-managed object may only be provided during an active JSF life-cycle.
Added: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/qualifier/Faces.java
===================================================================
--- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/qualifier/Faces.java (rev 0)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/qualifier/Faces.java 2010-05-26 14:49:09 UTC (rev 12815)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.faces.qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Qualifier;
+
+/**
+ * A @{@link Qualifier} for an object or @{@link Produces} method that depends
+ * on the presence of an active JSF life-cycle in order to be injected
+ * successfully. This means that JSF must currently be servicing an active
+ * Request in order for an object qualified with <b>this</b> annotation in order
+ * to be available.
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+@Qualifier
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Retention(RUNTIME)
+public @interface Faces
+{
+
+}
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-05-26 14:37:17 UTC (rev 12814)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-05-26 14:49:09 UTC (rev 12815)
@@ -22,11 +22,13 @@
package org.jboss.seam.faces.international;
import java.util.Locale;
+
import javax.enterprise.inject.Produces;
-
+import javax.faces.context.FacesContext;
import javax.inject.Inject;
-import javax.faces.context.FacesContext;
+import org.jboss.seam.faces.qualifier.Faces;
+
/**
* A specialized version of the LocaleProducer that returns the Locale
* associated with the current UIViewRoot or, if the UIViewRoot has not been
@@ -41,10 +43,11 @@
public boolean isActive()
{
- return facesContext != null && facesContext.getCurrentPhaseId() != null;
+ return (facesContext != null) && (facesContext.getCurrentPhaseId() != null);
}
@Produces
+ @Faces
public Locale getLocale()
{
if (facesContext.getViewRoot() != null)
15 years, 11 months