seam-commits March 2013

seam-commits@lists.jboss.org

2 participants
43 discussions

Seam SVN: r15434 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-03-01 10:16:00 -0500 (Fri, 01 Mar 2013) New Revision: 15434 Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java Log: bz912629 - backport of JBSEAM-5067 skipping intercepting equals method in JavaBeanInterceptor Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java 2013-03-01 15:15:47 UTC (rev 15433) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java 2013-03-01 15:16:00 UTC (rev 15434) @@ -19,6 +19,7 @@ * Controller interceptor for JavaBean components * * @author Gavin King + * @author Marel Novotny */ public class JavaBeanInterceptor extends RootInterceptor implements MethodHandler @@ -79,18 +80,22 @@ return (bean instanceof HttpSessionActivationListener) ? method.invoke(bean, params) : null; } } - } + else if ( params.length==1 && method.getName().equals("equals") && (params[0] == proxy) ) + { + //make default equals() method return true when called on itself + //by unwrapping the proxy + //We don't let calling this equals make us dirty, as we assume it is without side effects + //this assumption is required, as Mojarra 2.0 calls equals during SessionMap.put, see JBSEAM-4966 + if ( method.getParameterTypes().length == 1 && method.getParameterTypes()[0] == Object.class) + { + return proceed.invoke(proxy, params); + } - //make default equals() method return true when called on itself - //by unwrapping the proxy - //We don't let calling this equals make us dirty, as we assume it is without side effects - //this assumption is required, as Mojarra 2.0 calls equals during SessionMap.put, see JBSEAM-4966 - if ( method.getName().equals("equals") - && method.getParameterTypes().length == 1 - && method.getParameterTypes()[0] == Object.class - && params[0] == proxy) - { - return interceptInvocation(method, new Object[]{bean}); + } // JBSEAM-5066 - we need to skip the interceptInvocation in case of Object.equals(otherObject) + else if ( params.length==1 && method.getName().equals("equals") && (params[0] != proxy)) + { + return proceed.invoke(bean, params); + } } if ( markDirty(method) )

11 years, 1 month

1
0
0 / 0

Seam SVN: r15433 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-03-01 10:15:47 -0500 (Fri, 01 Mar 2013) New Revision: 15433 Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt Log: bz876969 replaced outstanding AS7 with EAP 6.x Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt =================================================================== --- branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt 2013-02-28 08:45:51 UTC (rev 15432) +++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt 2013-03-01 15:15:47 UTC (rev 15433) @@ -87,13 +87,13 @@ <your_application>/#{ejbName}/local to java:app/<application-module-name>/#{ejbName} like for instance in WEB-INF/components.xml change jndiPattern from: seam-mail/#{ejbName}/local to java:app/seam-mail-ejb/#{ejbName} -JBoss AS 7.1 deployment +EAP 6.x deployment -------------------------- -If you using for development or testing default datasource in JBoss AS 7.1, change jndi string in your persistence.xml +If you using for development or testing default datasource in EAP 6.x, change jndi string in your persistence.xml from java:/DefaultDS to java:jboss/datasources/ExampleDS. -JBoss AS 7 has got refactored classloading and specific classloading of bundled or provided libraries can be managed in +EAP 6.x has got refactored classloading and specific classloading of bundled or provided libraries can be managed in jboss-deployment-structure.xml, which should be placed in META-INF directory of your application. Minimal content for Seam 2.3 based application is: <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> @@ -112,8 +112,8 @@ Dependency changes (Maven) -------------------------- -The "provided" platform is now JBoss AS 7.1.x, therefore all Java EE dependencies included -in AS 7 are now marked as provided. Seam uses JBoss Java EE BOM files through Seam BOM file for declaring dependencies. +The "provided" platform is now EAP 6.x, therefore all Java EE dependencies included +in EAP 6.x are now marked as provided. Seam uses JBoss Java EE BOM files through Seam BOM file for declaring dependencies. You should add import of org.jboss.seam:bom only and then just use the dependency groupId:artifactId[:scope] wherever in your maven project. The following snippet uses version property ${seam.version}, which you can replace by real string version or define it as current latest available 2.3.x release.

11 years, 1 month

1
0
0 / 0

[seam2/jboss-seam] ac6fb8: changed parent information and updated scm values ...

by GitHub

Branch: refs/heads/Seam_2_3 Home: https://github.com/seam2/jboss-seam Commit: ac6fb8a0ba96adda9cc9feeba03db6058da05f5c https://github.com/seam2/jboss-seam/commit/ac6fb8a0ba96adda9cc9feeba03db6... Author: Marek Novotný <hotmana76(a)gmail.com> Date: 2013-02-28 (Thu, 28 Feb 2013) Changed paths: M pom.xml Log Message: ----------- changed parent information and updated scm values for github repository Commit: 3781eba82a455d09a0bad483edc8ba3d70fbae32 https://github.com/seam2/jboss-seam/commit/3781eba82a455d09a0bad483edc8ba... Author: Marek Novotný <hotmana76(a)gmail.com> Date: 2013-03-01 (Fri, 01 Mar 2013) Changed paths: M jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java Log Message: ----------- JBSEAM-5067 skipping intercepting equals method in JavaBeanInterceptor Compare: https://github.com/seam2/jboss-seam/compare/40dde97b48eb...3781eba82a45

11 years, 1 month

1
0
0 / 0

← Newer
1
2
3
4
5
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2013