Seam SVN: r8811 - tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/faces.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-08-26 09:52:01 -0400 (Tue, 26 Aug 2008)
New Revision: 8811
Modified:
tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/faces/FacesMessages.java
Log:
port of JBSEAM-3318 in 2.1.0.BETA1 tag
Modified: tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/faces/FacesMessages.java
===================================================================
--- tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 13:51:33 UTC (…
[View More]rev 8810)
+++ tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 13:52:01 UTC (rev 8811)
@@ -22,8 +22,6 @@
import org.jboss.seam.international.StatusMessages;
import org.jboss.seam.util.Strings;
-import com.sun.mail.handlers.message_rfc822;
-
/**
* A Seam component that propagates FacesMessages across redirects
* and interpolates EL expressions in the message string.
[View Less]
16 years, 6 months
Seam SVN: r8810 - tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/international.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-08-26 09:51:33 -0400 (Tue, 26 Aug 2008)
New Revision: 8810
Modified:
tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/international/StatusMessages.java
Log:
port of JBSEAM-3318 in 2.1.0.BETA1 tag
Modified: tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/international/StatusMessages.java
===================================================================
--- tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/international/StatusMessages.java …
[View More]2008-08-26 12:36:12 UTC (rev 8809)
+++ tags/JBoss_Seam_2_1_0_BETA1/src/main/org/jboss/seam/international/StatusMessages.java 2008-08-26 13:51:33 UTC (rev 8810)
@@ -14,6 +14,7 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.international.StatusMessage.Severity;
+import org.jboss.seam.util.Strings;
/**
* Abstract base class for providing status messages. View layers should provide
@@ -71,17 +72,23 @@
*/
public void add(Severity severity, String key, String detailKey, String messageTemplate, String messageDetailTemplate, final Object... params)
{
- final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
- messages.add(message);
- getTasks().add(
- new Runnable()
- {
- public void run()
- {
- message.interpolate(params);
- }
- }
- );
+ if (!Strings.isEmpty(key))
+ {
+ final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
+ if (!Strings.isEmpty(message.getSummary()))
+ {
+ messages.add(message);
+ getTasks().add(
+ new Runnable()
+ {
+ public void run()
+ {
+ message.interpolate(params);
+ }
+ }
+ );
+ }
+ }
}
/**
@@ -98,29 +105,34 @@
*/
public void addToControl(String id, Severity severity, String key, String messageTemplate, final Object... params)
{
- final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
- if (keyedMessages.containsKey(id))
- {
- keyedMessages.get(id).add(message);
- }
- else
- {
- List<StatusMessage> list = new ArrayList<StatusMessage>();
- list.add(message);
- keyedMessages.put(id, list);
- }
- getTasks().add(
- new Runnable()
+ if (!Strings.isEmpty(key))
+ {
+ final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
+ if (!Strings.isEmpty(message.getSummary()))
+ {
+ if (keyedMessages.containsKey(id))
{
-
- public void run()
- {
- message.interpolate(params);
- }
-
+ keyedMessages.get(id).add(message);
}
- );
-
+ else
+ {
+ List<StatusMessage> list = new ArrayList<StatusMessage>();
+ list.add(message);
+ keyedMessages.put(id, list);
+ }
+ getTasks().add(
+ new Runnable()
+ {
+
+ public void run()
+ {
+ message.interpolate(params);
+ }
+
+ }
+ );
+ }
+ }
}
/**
[View Less]
16 years, 6 months
Seam SVN: r8809 - in trunk/src/main/org/jboss/seam: international and 1 other directory.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-26 08:36:12 -0400 (Tue, 26 Aug 2008)
New Revision: 8809
Modified:
trunk/src/main/org/jboss/seam/faces/FacesMessages.java
trunk/src/main/org/jboss/seam/international/StatusMessages.java
Log:
JBSEAM-3318
Modified: trunk/src/main/org/jboss/seam/faces/FacesMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 12:18:33 UTC (rev 8808)
+++ trunk/src/…
[View More]main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 12:36:12 UTC (rev 8809)
@@ -43,11 +43,7 @@
{
for (StatusMessage statusMessage: getMessages())
{
- FacesMessage message = toFacesMessage(statusMessage);
- if (message != null)
- {
- FacesContext.getCurrentInstance().addMessage( null, message );
- }
+ FacesContext.getCurrentInstance().addMessage( null, toFacesMessage(statusMessage) );
}
for ( Map.Entry<String, List<StatusMessage>> entry: getKeyedMessages().entrySet() )
{
Modified: trunk/src/main/org/jboss/seam/international/StatusMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/international/StatusMessages.java 2008-08-26 12:18:33 UTC (rev 8808)
+++ trunk/src/main/org/jboss/seam/international/StatusMessages.java 2008-08-26 12:36:12 UTC (rev 8809)
@@ -14,6 +14,7 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.international.StatusMessage.Severity;
+import org.jboss.seam.util.Strings;
/**
* Abstract base class for providing status messages. View layers should provide
@@ -71,17 +72,23 @@
*/
public void add(Severity severity, String key, String detailKey, String messageTemplate, String messageDetailTemplate, final Object... params)
{
- final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
- messages.add(message);
- getTasks().add(
- new Runnable()
- {
- public void run()
- {
- message.interpolate(params);
- }
- }
- );
+ if (!Strings.isEmpty(key))
+ {
+ final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
+ if (!Strings.isEmpty(message.getSummary()))
+ {
+ messages.add(message);
+ getTasks().add(
+ new Runnable()
+ {
+ public void run()
+ {
+ message.interpolate(params);
+ }
+ }
+ );
+ }
+ }
}
/**
@@ -98,29 +105,34 @@
*/
public void addToControl(String id, Severity severity, String key, String messageTemplate, final Object... params)
{
- final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
- if (keyedMessages.containsKey(id))
- {
- keyedMessages.get(id).add(message);
- }
- else
- {
- List<StatusMessage> list = new ArrayList<StatusMessage>();
- list.add(message);
- keyedMessages.put(id, list);
- }
- getTasks().add(
- new Runnable()
+ if (!Strings.isEmpty(key))
+ {
+ final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
+ if (!Strings.isEmpty(message.getSummary()))
+ {
+ if (keyedMessages.containsKey(id))
{
-
- public void run()
- {
- message.interpolate(params);
- }
-
+ keyedMessages.get(id).add(message);
}
- );
-
+ else
+ {
+ List<StatusMessage> list = new ArrayList<StatusMessage>();
+ list.add(message);
+ keyedMessages.put(id, list);
+ }
+ getTasks().add(
+ new Runnable()
+ {
+
+ public void run()
+ {
+ message.interpolate(params);
+ }
+
+ }
+ );
+ }
+ }
}
/**
[View Less]
16 years, 6 months
Seam SVN: r8808 - trunk/src/main/org/jboss/seam/faces.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-26 08:18:33 -0400 (Tue, 26 Aug 2008)
New Revision: 8808
Modified:
trunk/src/main/org/jboss/seam/faces/FacesMessages.java
Log:
JBSEAM-3318
Modified: trunk/src/main/org/jboss/seam/faces/FacesMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 12:15:58 UTC (rev 8807)
+++ trunk/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-26 12:18:33 UTC …
[View More](rev 8808)
@@ -22,8 +22,6 @@
import org.jboss.seam.international.StatusMessages;
import org.jboss.seam.util.Strings;
-import com.sun.mail.handlers.message_rfc822;
-
/**
* A Seam component that propagates FacesMessages across redirects
* and interpolates EL expressions in the message string.
@@ -45,7 +43,11 @@
{
for (StatusMessage statusMessage: getMessages())
{
- FacesContext.getCurrentInstance().addMessage( null, toFacesMessage(statusMessage) );
+ FacesMessage message = toFacesMessage(statusMessage);
+ if (message != null)
+ {
+ FacesContext.getCurrentInstance().addMessage( null, message );
+ }
}
for ( Map.Entry<String, List<StatusMessage>> entry: getKeyedMessages().entrySet() )
{
[View Less]
16 years, 6 months
Seam SVN: r8807 - branches/Seam_2_0/src/main/org/jboss/seam/core.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-26 08:15:58 -0400 (Tue, 26 Aug 2008)
New Revision: 8807
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
Log:
all components treated equally
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-08-26 09:31:27 UTC (rev 8806)
+++ …
[View More]branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-08-26 12:15:58 UTC (rev 8807)
@@ -23,22 +23,11 @@
private static final long serialVersionUID = 4686458105931528659L;
private boolean injected;
-
- private boolean canDisinject;
-
+
private int counter = 0;
private ReentrantLock lock = new ReentrantLock();
-
- @Override
- public void setComponent(Component component)
- {
- super.setComponent(component);
-
- canDisinject = !(component.getScope().equals(ScopeType.SESSION)
- || component.getScope().equals(ScopeType.APPLICATION));
- }
-
+
@AroundInvoke
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
@@ -79,7 +68,7 @@
finally
{
// Avoid an extra lock by disinjecting here instead of the finally block
- if (injected && canDisinject)
+ if (injected)
{
injected = false;
component.disinject( invocation.getTarget() );
@@ -96,7 +85,7 @@
}
finally
{
- if (injected && canDisinject)
+ if (injected)
{
lock.lock();
try
[View Less]
16 years, 6 months
Seam SVN: r8806 - tags.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-08-26 05:31:27 -0400 (Tue, 26 Aug 2008)
New Revision: 8806
Added:
tags/Seam_FP_CR2a/
Log:
tag for CR2a build
Copied: tags/Seam_FP_CR2a (from rev 8805, branches/Seam_2_0_FP)
16 years, 6 months
Seam SVN: r8805 - branches/Seam_2_0_FP/build.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-08-26 03:42:07 -0400 (Tue, 26 Aug 2008)
New Revision: 8805
Modified:
branches/Seam_2_0_FP/build/parent.pom.xml
branches/Seam_2_0_FP/build/root.pom.xml
Log:
JBPAPP-1098
Modified: branches/Seam_2_0_FP/build/parent.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/parent.pom.xml 2008-08-26 05:27:25 UTC (rev 8804)
+++ branches/Seam_2_0_FP/build/parent.pom.xml 2008-08-26 07:42:07 UTC (rev 8805)
@@ -24,6 +24,19 …
[View More]@@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: branches/Seam_2_0_FP/build/root.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/root.pom.xml 2008-08-26 05:27:25 UTC (rev 8804)
+++ branches/Seam_2_0_FP/build/root.pom.xml 2008-08-26 07:42:07 UTC (rev 8805)
@@ -658,7 +658,7 @@
<dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
- <version>2.0.1.GA</version>
+ <version>1.0_02.CR2</version>
</dependency>
<dependency>
[View Less]
16 years, 6 months
Seam SVN: r8804 - branches/Seam_2_0/src/main/org/jboss/seam/core.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-26 01:27:25 -0400 (Tue, 26 Aug 2008)
New Revision: 8804
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
Log:
oops
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-08-26 04:53:56 UTC (rev 8803)
+++ branches/Seam_2_0/src/main/org/…
[View More]jboss/seam/core/BijectionInterceptor.java 2008-08-26 05:27:25 UTC (rev 8804)
@@ -42,6 +42,7 @@
@AroundInvoke
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
+ Component component = getComponent();
boolean enforceRequired = !component.isLifecycleMethod( invocation.getMethod() );
try
[View Less]
16 years, 6 months
Seam SVN: r8803 - branches/Seam_2_0/src/main/org/jboss/seam/core.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-08-26 00:53:56 -0400 (Tue, 26 Aug 2008)
New Revision: 8803
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
Log:
JBSEAM-3301
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-08-25 19:38:10 UTC (rev 8802)
+++ branches/Seam_2_0/src/…
[View More]main/org/jboss/seam/core/BijectionInterceptor.java 2008-08-26 04:53:56 UTC (rev 8803)
@@ -1,7 +1,10 @@
//$Id$
package org.jboss.seam.core;
+import java.util.concurrent.locks.ReentrantLock;
+
import org.jboss.seam.Component;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.AbstractInterceptor;
@@ -12,51 +15,103 @@
* invoking, outject dependencies back into their context.
*
* @author Gavin King
+ * @author Shane Bryzak
*/
@Interceptor
public class BijectionInterceptor extends AbstractInterceptor
{
private static final long serialVersionUID = 4686458105931528659L;
- private Integer counter = 0;
+ private boolean injected;
+
+ private boolean canDisinject;
+
+ private int counter = 0;
+
+ private ReentrantLock lock = new ReentrantLock();
+
+ @Override
+ public void setComponent(Component component)
+ {
+ super.setComponent(component);
+
+ canDisinject = !(component.getScope().equals(ScopeType.SESSION)
+ || component.getScope().equals(ScopeType.APPLICATION));
+ }
@AroundInvoke
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
+ boolean enforceRequired = !component.isLifecycleMethod( invocation.getMethod() );
+
try
- {
- synchronized (counter)
+ {
+ lock.lock();
+ try
{
- if (counter == 0)
- {
- Component component = getComponent();
- boolean enforceRequired = !component.isLifecycleMethod( invocation.getMethod() );
+ if (!injected)
+ {
component.inject( invocation.getTarget(), enforceRequired );
+ injected = true;
}
+
counter++;
}
-
+ finally
+ {
+ lock.unlock();
+ }
+
Object result = invocation.proceed();
-
- if (counter == 1)
+
+ lock.lock();
+ try
{
- Component component = getComponent();
- boolean enforceRequired = !component.isLifecycleMethod( invocation.getMethod() );
- component.outject( invocation.getTarget(), enforceRequired );
+ counter--;
+
+ if (counter == 0)
+ {
+ try
+ {
+ component.outject( invocation.getTarget(), enforceRequired );
+ }
+ finally
+ {
+ // Avoid an extra lock by disinjecting here instead of the finally block
+ if (injected && canDisinject)
+ {
+ injected = false;
+ component.disinject( invocation.getTarget() );
+ }
+ }
+ }
}
+ finally
+ {
+ lock.unlock();
+ }
+
return result;
}
finally
- {
- synchronized (counter)
+ {
+ if (injected && canDisinject)
{
- if (counter == 1)
+ lock.lock();
+ try
{
- Component component = getComponent();
- component.disinject( invocation.getTarget() );
+ counter--;
+
+ if (counter == 0)
+ {
+ injected = false;
+ component.disinject( invocation.getTarget() );
+ }
}
- counter--;
-
+ finally
+ {
+ lock.unlock();
+ }
}
}
}
[View Less]
16 years, 6 months
Seam SVN: r8802 - in trunk/examples: jpa and 1 other directory.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-08-25 15:38:10 -0400 (Mon, 25 Aug 2008)
New Revision: 8802
Modified:
trunk/examples/hibernate/build-jboss-embedded.xml
trunk/examples/jpa/build-jboss-embedded.xml
Log:
JBSEAM-3325
Modified: trunk/examples/hibernate/build-jboss-embedded.xml
===================================================================
--- trunk/examples/hibernate/build-jboss-embedded.xml 2008-08-25 14:26:47 UTC (rev 8801)
+++ trunk/examples/hibernate/build-jboss-embedded.xml …
[View More]2008-08-25 19:38:10 UTC (rev 8802)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Hibernate Booking" default="jbosswar.archive" basedir=".">
+<project name="Hibernate Booking" default="tomcat.deploy" basedir=".">
<!-- Naming -->
<property name="Name" value="The Hibernate Example for JBoss Embedded in Tomcat"/>
Modified: trunk/examples/jpa/build-jboss-embedded.xml
===================================================================
--- trunk/examples/jpa/build-jboss-embedded.xml 2008-08-25 14:26:47 UTC (rev 8801)
+++ trunk/examples/jpa/build-jboss-embedded.xml 2008-08-25 19:38:10 UTC (rev 8802)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="JPA Booking" default="jbosswar.archive" basedir=".">
+<project name="JPA Booking" default="tomcat.deploy" basedir=".">
<!-- Naming -->
<property name="Name" value="The JPA Example for JBoss Embedded in Tomcat"/>
[View Less]
16 years, 6 months