Seam SVN: r15459 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-19 05:12:29 -0400 (Tue, 19 Mar 2013)
New Revision: 15459
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt
Log:
bz876969 - fixed remaining issues in seam23migration.txt
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt 2013-03-18 13:14:04 UTC (rev 15458)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam23migration.txt 2013-03-19 09:12:29 UTC (rev 15459)
@@ -26,7 +26,7 @@
5. Add arquillian.xml file into root of your classpath for running test(s). The file content should specify path to
remote or managed container and some specific options for JVM or Arquillian. Example of arquillian file is at
examples/booking/booking-tests/src/test/resources-integration/arquillian.xml.
-More details in Seam reference documentation guide in chapter 37. Testing Seam applications.
+More details in Seam reference documentation guide in Chapter 33. Testing Seam applications.
Schemas
----------------
@@ -105,7 +105,7 @@
</dependencies>
</deployment>
</jboss-deployment-structure>
-More details are described in JBoss AS 7 documentation.
+More details are described in EAP 6 documentation.
11 years
Seam SVN: r15458 - in branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui: util and 1 other directory.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 09:14:04 -0400 (Mon, 18 Mar 2013)
New Revision: 15458
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java
Log:
bz920625 calling getBookmarkableUrl instead of getActionUrl
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2013-03-18 11:43:41 UTC (rev 15457)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2013-03-18 13:14:04 UTC (rev 15458)
@@ -103,12 +103,12 @@
url.addParameter(uiPropagation);
}
- if (propagationType == PropagationType.NONE)
- {
- UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance();
- uiPropagation.setType(getPropagation());
- url.addParameter(uiPropagation);
- }
+// if (propagationType == PropagationType.NONE)
+// {
+// UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance();
+// uiPropagation.setType(getPropagation());
+// url.addParameter(uiPropagation);
+// }
if (getConversationName() != null)
{
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2013-03-18 11:43:41 UTC (rev 15457)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2013-03-18 13:14:04 UTC (rev 15458)
@@ -22,8 +22,7 @@
throw new NullPointerException("viewId must not be null");
}
FacesContext facesContext = FacesContext.getCurrentInstance();
- String url = facesContext.getApplication().getViewHandler().getActionURL(facesContext,
- viewId);
+ String url = facesContext.getApplication().getViewHandler().getBookmarkableURL(facesContext, viewId, null, false);
url = Pages.instance().encodeScheme(viewId, facesContext, url);
setUrl(url);
11 years
Seam SVN: r15457 - in branches/enterprise/WFK-2_1: jboss-seam-gen/dist/util and 1 other directories.
by seam-commits@lists.jboss.org
Author: vdedik
Date: 2013-03-18 07:43:41 -0400 (Mon, 18 Mar 2013)
New Revision: 15457
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl
branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml
Log:
fix of the fix for bz 875867
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-03-18 09:38:02 UTC (rev 15456)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-03-18 11:43:41 UTC (rev 15457)
@@ -25,8 +25,4 @@
<phase-listener>org.jboss.seam.document.DocumentStorePhaseListener</phase-listener>
</lifecycle>
- <converter>
- <converter-id>javax.faces.DateTime</converter-id>
- <converter-class>org.jboss.seam.ui.converter.DateTimeConverter</converter-class>
- </converter>
</faces-config>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl 2013-03-18 09:38:02 UTC (rev 15456)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl 2013-03-18 11:43:41 UTC (rev 15457)
@@ -39,15 +39,15 @@
<#assign padding = ""?left_pad(indent)/>
<#if isDate(property)>
${padding}<h:outputText value="${expression}">
-${padding} <f:convertDateTime type="date" dateStyle="short"/>
+${padding} <s:convertDateTime type="date" dateStyle="short"/>
${padding}</h:outputText>
<#elseif isTime(property)>
${padding}<h:outputText value="${expression}">
-${padding} <f:convertDateTime type="time"/>
+${padding} <s:convertDateTime type="time"/>
${padding}</h:outputText>
<#elseif isTimestamp(property)>
${padding}<h:outputText value="${expression}">
-${padding} <f:convertDateTime type="both" dateStyle="short"/>
+${padding} <s:convertDateTime type="both" dateStyle="short"/>
${padding}</h:outputText>
<#elseif isBigDecimal(property)>
${padding}<h:outputText value="${expression}">
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl 2013-03-18 09:38:02 UTC (rev 15456)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl 2013-03-18 11:43:41 UTC (rev 15457)
@@ -25,7 +25,7 @@
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <f:convertDateTime type="time"/>
+ <s:convertDateTime type="time"/>
<a:ajax event="blur" render="${componentProperty.name}Field" bypassUpdates="true"/>
</h:inputText>
<#elseif isTimestamp(componentProperty)>
@@ -136,7 +136,7 @@
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}">
- <f:convertDateTime type="time"/>
+ <s:convertDateTime type="time"/>
<a:ajax event="blur" render="${property.name}Field" bypassUpdates="true"/>
</h:inputText>
<#elseif isTimestamp(property)>
11 years
Seam SVN: r15456 - branches/enterprise/WFK-2_1/bom.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:38:02 -0400 (Mon, 18 Mar 2013)
New Revision: 15456
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
bz922026 fixed jsf-impl version in BOM
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-03-18 09:21:02 UTC (rev 15455)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-03-18 09:38:02 UTC (rev 15456)
@@ -36,7 +36,7 @@
<version.resteasy>2.3.4.Final-redhat-2</version.resteasy>
<version.spring>3.1.4.RELEASE</version.spring>
<version.jbossas7>7.1.1.Final</version.jbossas7>
- <version.jsf2>2.1.7-redhat-1</version.jsf2>
+ <version.jsf2>2.1.13-redhat-1</version.jsf2>
<!-- <version.webdriver>0.9.7376</version.webdriver> -->
<version.infinispan>5.1.8.Final-redhat-1</version.infinispan>
<version.junit>4.10</version.junit>
11 years
Seam SVN: r15455 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/test.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:21:02 -0400 (Mon, 18 Mar 2013)
New Revision: 15455
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/test/readme.txt
Log:
bz922041 fixed readme.txt for running ARQ tests
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/test/readme.txt
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/test/readme.txt 2013-03-18 09:20:55 UTC (rev 15454)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/test/readme.txt 2013-03-18 09:21:02 UTC (rev 15455)
@@ -1,11 +1,14 @@
-If you want to run tests using the Eclipse Junit plugin, you'll need to add
-all jars from lib/test/ directory to your classpath on the top of your project classpath.
- Using the Run Dialog, select the test class to run, and select these entries from the project tree:
+If you want to run tests using the Eclipse Junit plugin, use the Run Dialog,
+select the test class to run, and select the following entries from the project tree:
lib/test/*.jar
lib/*.jar
+
+Start remote container (EAP 6) before you continue.
Seam uses Arquillian in its integration testing and uses prepared result from test-build/ subdirectory when you
run ant target:
+
$ ant test
+
11 years
Seam SVN: r15454 - branches/enterprise/WFK-2_1/distribution.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:20:55 -0400 (Mon, 18 Mar 2013)
New Revision: 15454
Modified:
branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml
Log:
bz922041, updated version of supported ARQ to 1.0.3.Final in ant script
Modified: branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2013-03-18 09:14:50 UTC (rev 15453)
+++ branches/enterprise/WFK-2_1/distribution/get-arquillian-libs.xml 2013-03-18 09:20:55 UTC (rev 15454)
@@ -7,7 +7,7 @@
<property name="test.lib.dir" location="test" />
<property name="version.jboss-as7" value="7.1.1.Final"/>
- <property name="version.arquillian-junit" value="1.0.1.Final"/>
+ <property name="version.arquillian-junit" value="1.0.3.Final"/>
<target name="copyarq">
<mkdir dir="${test.lib.dir}"/>
<aether:resolve>
11 years
Seam SVN: r15453 - branches/enterprise/WFK-2_1/bom.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:14:50 -0400 (Mon, 18 Mar 2013)
New Revision: 15453
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
bz920053 updated ISPN in seam to not rely on EAP 6.0.0
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-03-18 09:14:45 UTC (rev 15452)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-03-18 09:14:50 UTC (rev 15453)
@@ -38,7 +38,7 @@
<version.jbossas7>7.1.1.Final</version.jbossas7>
<version.jsf2>2.1.7-redhat-1</version.jsf2>
<!-- <version.webdriver>0.9.7376</version.webdriver> -->
- <version.infinispan>5.1.4.Final-redhat-2</version.infinispan>
+ <version.infinispan>5.1.8.Final-redhat-1</version.infinispan>
<version.junit>4.10</version.junit>
<version.testng>5.14.10</version.testng>
<version.org.jboss.bom>1.0.4.Final-redhat-wfk-1</version.org.jboss.bom>
11 years
Seam SVN: r15452 - branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:14:45 -0400 (Mon, 18 Mar 2013)
New Revision: 15452
Modified:
branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml
Log:
bz869638 m2e lifecycle for antrun-plugin in groovybooking web example
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-03-18 09:14:38 UTC (rev 15451)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-03-18 09:14:45 UTC (rev 15452)
@@ -219,6 +219,41 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.3,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
11 years
Seam SVN: r15451 - branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2013-03-18 05:14:38 -0400 (Mon, 18 Mar 2013)
New Revision: 15451
Modified:
branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/loginExp.html
branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/mainExp.html
branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/registerExp.html
Log:
fixed html letters to not warn in JBDS
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/loginExp.html
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/loginExp.html 2013-03-18 09:14:20 UTC (rev 15450)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/loginExp.html 2013-03-18 09:14:38 UTC (rev 15451)
@@ -30,12 +30,12 @@
<code class="block">
<div>
- <h:outputLabel for="username">Login Name</h:outputLabel>
- <h:inputText id="username" value="#{identity.username}" />
+ <h:outputLabel for="username" > Login Name</h:outputLabel>
+ <h:inputText id="username" value="#{identity.username}" />
</div>
<div>
- <h:outputLabel for="password">Password</h:outputLabel>
- <h:inputSecret id="password" value="#{identity.password}" />
+ <h:outputLabel for="password" > Password</h:outputLabel>
+ <h:inputSecret id="password" value="#{identity.password}" />
</div>
... ...
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/mainExp.html
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/mainExp.html 2013-03-18 09:14:20 UTC (rev 15450)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/mainExp.html 2013-03-18 09:14:38 UTC (rev 15451)
@@ -91,7 +91,7 @@
public boolean isNextPageAvailable()
{
- return hotels!=null && hotels.size()==pageSize;
+ return hotels!=null && hotels.size()==pageSize;
}
public int getPageSize() {
@@ -137,7 +137,7 @@
<code class="block">
<h:outputText value="No Hotels Found"
rendered="#{hotels != null and hotels.rowCount==0}"/>
-<h:dataTable value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
+<h:dataTable value="#{hotels}" var="hot" rendered="#{hotels.rowCount > 0}">
<h:column>
<f:facet name="header">Name</f:facet>
#{hot.name}
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/registerExp.html
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/registerExp.html 2013-03-18 09:14:20 UTC (rev 15450)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/src/main/webapp/exp/registerExp.html 2013-03-18 09:14:38 UTC (rev 15451)
@@ -30,7 +30,7 @@
<s:validateAll>
<div class="entry">
<div class="label">
- <h:outputLabel for="username">Username:</h:outputLabel>
+ <h:outputLabel for="username" > Username:</h:outputLabel>
</div>
<div class="input">
<h:inputText id="username" value="#{user.username}"/><br/>
@@ -39,11 +39,11 @@
</div>
<div class="entry">
<div class="label">
- <h:outputLabel for="name">Real Name:</h:outputLabel>
+ <h:outputLabel for="name" > Real Name:</h:outputLabel>
</div>
<div class="input">
<h:inputText id="name" value="#{user.name}" /><br/>
- <span class="errors"><h:message for="name" /></span>
+ <span class="errors" > <h:message for="name" /></span>
</div>
</div>
</s:validateAll>
11 years
Seam SVN: r15450 - 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-18 05:14:20 -0400 (Mon, 18 Mar 2013)
New Revision: 15450
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java
Log:
enhancing JBSEAM-5066 fix
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-18 09:01:08 UTC (rev 15449)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java 2013-03-18 09:14:20 UTC (rev 15450)
@@ -80,22 +80,27 @@
return (bean instanceof HttpSessionActivationListener) ? method.invoke(bean, params) : null;
}
}
- else if ( params.length==1 && method.getName().equals("equals") && (params[0] == proxy) )
+ else if ( params.length==1 && method.getName().equals("equals") )
{
//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)
+ if ( method.getParameterTypes()[0] == Object.class )
{
- return proceed.invoke(proxy, params);
- }
+ // JBSEAM-5066 - we need to skip the interceptInvocation in case of Object.equals(otherObject)
+ if (params[0] == proxy )
+ {
+ return method.invoke(bean, new Object[]{bean});
+ }
+ else
+ {
+ return method.invoke(bean, params);
+ }
+
+ }
- } // 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