Seam SVN: r9446 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-27 13:59:40 -0400 (Mon, 27 Oct 2008)
New Revision: 9446
Modified:
trunk/seam-gen/build.xml
Log:
add filterset jdbc when copying idea project file
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-10-27 17:58:15 UTC (rev 9445)
+++ trunk/seam-gen/build.xml 2008-10-27 17:59:40 UTC (rev 9446)
@@ -784,6 +784,7 @@
<copy tofile="${project.home}/${project.name}.ipr"
file="${templates.dir}/ide-project-files/idea/project.ipr">
<filterset refid="project"/>
+ <filterset refid="jdbc"/>
</copy>
<copy tofile="${project.home}/${project.name}.iml"
file="${templates.dir}/ide-project-files/idea/module.iml">
15 years, 6 months
Seam SVN: r9445 - trunk.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-27 13:58:15 -0400 (Mon, 27 Oct 2008)
New Revision: 9445
Modified:
trunk/seam
Log:
minor (missing hash mark in comment)
Modified: trunk/seam
===================================================================
--- trunk/seam 2008-10-27 17:12:00 UTC (rev 9444)
+++ trunk/seam 2008-10-27 17:58:15 UTC (rev 9445)
@@ -4,7 +4,7 @@
# #
# seam-gen - Seam project and code generator #
# #
-############################################ #
+##############################################
# Validate the JDK installation
if [ -z "$JAVA_HOME" ]; then
15 years, 6 months
Seam SVN: r9444 - tags.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-27 13:12:00 -0400 (Mon, 27 Oct 2008)
New Revision: 9444
Added:
tags/JBoss_Seam_2_1_0_SP1/
Log:
tag
Copied: tags/JBoss_Seam_2_1_0_SP1 (from rev 9443, tags/JBoss_Seam_2_1_0_GA)
15 years, 6 months
Seam SVN: r9443 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 11:34:57 -0400 (Mon, 27 Oct 2008)
New Revision: 9443
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
Log:
JBPAPP-1300
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-10-27 15:16:42 UTC (rev 9442)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-10-27 15:34:57 UTC (rev 9443)
@@ -144,7 +144,7 @@
{
throw new IllegalStateException("cannot passivate persistence context with active transaction");
}
- if ( session!=null && !session.isDirty() )
+ if ( session!=null && session.isOpen() && !session.isDirty() )
{
session.close();
session = null;
@@ -212,7 +212,7 @@
{
log.debug("destroying seam managed session for session factory: " + sessionFactoryJndiName);
}
- if (session!=null)
+ if (session!=null && session.isOpen())
{
session.close();
}
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-10-27 15:16:42 UTC (rev 9442)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-10-27 15:34:57 UTC (rev 9443)
@@ -221,7 +221,7 @@
log.debug("destroying seam managed persistence context for persistence unit: " + persistenceUnitJndiName);
}
- if (entityManager!=null)
+ if (entityManager!=null && entityManager.isOpen())
{
entityManager.close();
}
15 years, 6 months
Seam SVN: r9442 - branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 11:16:42 -0400 (Mon, 27 Oct 2008)
New Revision: 9442
Modified:
branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml
Log:
JBPAPP-1295
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml 2008-10-27 15:14:11 UTC (rev 9441)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml 2008-10-27 15:16:42 UTC (rev 9442)
@@ -29,13 +29,13 @@
</page>
<page view-id="/password.xhtml">
-
- <navigation>
- <rule if="#{changePassword.changed}">
- <redirect view-id="/main.xhtml"/>
+ <action execute="#{login.validateLogin}"/>
+
+ <navigation from-action="#{login.validateLogin}">
+ <rule if="#{not login.loggedIn}">
+ <redirect view-id="/home.xhtml"/>
</rule>
- </navigation>
-
+ </navigation>
</page>
<page view-id="/main.xhtml">
15 years, 6 months
Seam SVN: r9441 - branches/enterprise/JBPAPP_4_3_FP01/examples/remoting/helloworld/view.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 11:14:11 -0400 (Mon, 27 Oct 2008)
New Revision: 9441
Modified:
branches/enterprise/JBPAPP_4_3_FP01/examples/remoting/helloworld/view/helloworld.xhtml
Log:
JBPAPP-1326
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/remoting/helloworld/view/helloworld.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/remoting/helloworld/view/helloworld.xhtml 2008-10-27 15:06:47 UTC (rev 9440)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/remoting/helloworld/view/helloworld.xhtml 2008-10-27 15:14:11 UTC (rev 9441)
@@ -24,6 +24,7 @@
function sayHello() {
var name = prompt("What is your name?");
+ if (name == null) return;
Seam.Component.getInstance("helloAction").sayHello(name, sayHelloCallback);
}
15 years, 6 months
Seam SVN: r9440 - branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/graphicImage.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 11:06:47 -0400 (Mon, 27 Oct 2008)
New Revision: 9440
Modified:
branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/graphicImage/Image.java
Log:
JBPAPP-1316
Modified: branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/graphicImage/Image.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/graphicImage/Image.java 2008-10-27 15:03:45 UTC (rev 9439)
+++ branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/graphicImage/Image.java 2008-10-27 15:06:47 UTC (rev 9440)
@@ -420,6 +420,10 @@
}
Graphics2D graphics2D = image.createGraphics();
graphics2D.setBackground(new Color(255, 255, 255));
+ if (Type.IMAGE_PNG.equals(getContentType()))
+ {
+ graphics2D.setComposite(java.awt.AlphaComposite.Src);
+ }
graphics2D.clearRect(0, 0, image.getWidth(), image.getHeight());
graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BICUBIC);
15 years, 6 months
Seam SVN: r9439 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 11:03:45 -0400 (Mon, 27 Oct 2008)
New Revision: 9439
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
Log:
JBPAPP-1319
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-10-27 14:37:33 UTC (rev 9438)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-10-27 15:03:45 UTC (rev 9439)
@@ -16,6 +16,7 @@
import org.hibernate.StaleStateException;
import org.hibernate.TransientObjectException;
import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
import org.hibernate.type.VersionType;
import org.jboss.seam.Component;
import org.jboss.seam.Entity;
@@ -166,7 +167,14 @@
}
catch (TransientObjectException e)
{
- return super.getId(bean, entityManager);
+ if (bean instanceof HibernateProxy)
+ {
+ return super.getId(((HibernateProxy) bean).getHibernateLazyInitializer().getImplementation(), entityManager);
+ }
+ else
+ {
+ return super.getId(bean, entityManager);
+ }
}
}
15 years, 6 months
Seam SVN: r9438 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 10:37:33 -0400 (Mon, 27 Oct 2008)
New Revision: 9438
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBPAPP-1308
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-10-27 14:31:31 UTC (rev 9437)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-10-27 14:37:33 UTC (rev 9438)
@@ -347,10 +347,10 @@
{
if ( Init.instance().isTransactionManagementEnabled() )
{
- commitOrRollback(PhaseId.INVOKE_APPLICATION);
+ commitOrRollback("after invoking page actions");
if ( !facesContext.getResponseComplete() )
{
- begin(PhaseId.INVOKE_APPLICATION);
+ begin("before continuing render");
}
}
}
@@ -579,11 +579,16 @@
void begin(PhaseId phaseId)
{
+ begin("prior to phase: " + phaseId);
+ }
+
+ void begin(String phaseString)
+ {
try
{
if ( !Transaction.instance().isActiveOrMarkedRollback() )
{
- log.debug("beginning transaction prior to phase: " + phaseId);
+ log.debug("beginning transaction " + phaseString);
Transaction.instance().begin();
}
}
@@ -595,16 +600,21 @@
void commitOrRollback(PhaseId phaseId)
{
+ commitOrRollback("after phase: " + phaseId);
+ }
+
+ void commitOrRollback(String phaseString)
+ {
try
{
if ( Transaction.instance().isActive() )
{
- log.debug("committing transaction after phase: " + phaseId);
+ log.debug("committing transaction " + phaseString);
Transaction.instance().commit();
}
else if ( Transaction.instance().isRolledBackOrMarkedRollback() )
{
- log.debug("rolling back transaction after phase: " + phaseId);
+ log.debug("rolling back transaction " + phaseString);
Transaction.instance().rollback();
}
}
15 years, 6 months
Seam SVN: r9437 - branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/converter.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 10:31:31 -0400 (Mon, 27 Oct 2008)
New Revision: 9437
Modified:
branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java
Log:
JBPAPP-1313
Modified: branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2008-10-27 14:26:15 UTC (rev 9436)
+++ branches/enterprise/JBPAPP_4_3_FP01/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2008-10-27 14:31:31 UTC (rev 9437)
@@ -85,11 +85,14 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
if (valueExpression != null)
{
- Converter converter = facesContext.getApplication().createConverter(
- valueExpression.getType(facesContext.getELContext()));
- if (converter != null)
+ Class<?> type = valueExpression.getType(facesContext.getELContext());
+ if (type != null)
{
- addConverterToChain(converter);
+ Converter converter = facesContext.getApplication().createConverter(type);
+ if (converter != null)
+ {
+ addConverterToChain(converter);
+ }
}
}
}
15 years, 6 months