Seam SVN: r9456 - trunk/ui/src/main/java/org/jboss/seam/ui/facelet.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-28 15:14:33 -0400 (Tue, 28 Oct 2008)
New Revision: 9456
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java
Log:
needs to implement Serializable
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java 2008-10-28 18:56:13 UTC (rev 9455)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java 2008-10-28 19:14:33 UTC (rev 9456)
@@ -4,6 +4,7 @@
import javax.servlet.http.HttpSession;
+import java.io.Serializable;
import org.jboss.seam.Component;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
@@ -20,7 +21,7 @@
@BypassInterceptors
@Install(dependencies="org.jboss.seam.faces.renderer")
@AutoCreate
-public class HttpSessionManager
+public class HttpSessionManager implements Serializable
{
private HttpSession session;
16 years, 1 month
Seam SVN: r9455 - trunk/src/main/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-28 14:56:13 -0400 (Tue, 28 Oct 2008)
New Revision: 9455
Modified:
trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
Log:
JBSEAM-3580
Modified: trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-10-27 21:44:08 UTC (rev 9454)
+++ trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-10-28 18:56:13 UTC (rev 9455)
@@ -946,7 +946,7 @@
*/
protected void setupClass() throws Exception
{
- servletContext = (MockServletContext) ServletLifecycle.getServletContext();
+ servletContext = ServletLifecycle.getServletContext();
applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
application = applicationFactory.getApplication();
conversationViewRootAttributes = new HashMap<String, Map>();
16 years, 1 month
Seam SVN: r9454 - in branches/enterprise/JBPAPP_4_3_FP01: doc/Seam_Reference_Guide/en-US and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 17:44:08 -0400 (Mon, 27 Oct 2008)
New Revision: 9454
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Configuration.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Dependencies.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Framework.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Hsearch.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/I18n.xml
branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Tutorial.xml
Log:
Modified: branches/enterprise/JBPAPP_4_3_FP01/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/build.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -498,7 +498,7 @@
<copy file="changelog.txt" todir="${dist.dir}" />
<propertyfile file="${dist.dir}/build.properties" comment="See build/sample.build.properties for properties you might want to set">
<entry key="tomcat.home" value="/var/lib/tomcat5" />
- <entry key="jboss.home" value="/var/lib/jbossas" />
+ <entry key="jboss.home" value="/var/lib/jboss-as" />
<entry key="mavenized" value="false" />
<entry key="qualifier" value="${qualifier}" />
</propertyfile>
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Configuration.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Configuration.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Configuration.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -933,8 +933,7 @@
</container-cache-conf>]]></programlisting>
<para> The default HTTP session timeout can be modified in
- <literal>server/default/deploy/jbossweb-tomcat55.sar/conf/web.xml</literal> for JBoss 4.0.x, or in
- <literal>server/default/deploy/jboss-web.deployer/conf/web.xml</literal> for JBoss 4.2.x. The following
+ <literal>server/<profile>/deploy/jboss-web.deployer/conf/web.xml</literal> for JBoss EAP 4.3. The following
entry in this file controls the default session timeout for all web applications: </para>
<programlisting role="XML"><![CDATA[<session-config>
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Dependencies.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -48,7 +48,7 @@
type is listed as <literal>war</literal>, the library should be placed in
the <literal>/WEB-INF/lib</literal> directory of your application's war
file. The scope of the dependency is either all, runtime or provided (by
- JBoss AS 4.2).
+ JBoss EAP 4.3).
</para>
<para>
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Framework.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Framework.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Framework.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -78,7 +78,7 @@
A second advantage is that your classes may be EJB stateful
session beans, if you like. (They do not have to be, they
can be plain JavaBean components if you prefer.) If you are using
- JBoss AS, you'll need 4.2.2.GA or later:
+ JBoss EAP:
</para>
<programlisting role="JAVA"><![CDATA[@Stateful
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -24,7 +24,7 @@
<section>
<title>Before you start</title>
- <para>Make sure you have JDK 5 or JDK 6, JBoss AS 4.2 and Ant 1.6, along with recent versions of Eclipse, the
+ <para>Make sure you have JDK 5 or JDK 6, JBoss EAP 4.3 CP02 and Ant 1.6, along with recent versions of Eclipse, the
JBoss IDE plugin for Eclipse and the TestNG plugin for Eclipse correctly installed before starting. Add your
JBoss installation to the JBoss Server View in Eclipse. Start JBoss in debug mode. Finally, start a command
prompt in the directory where you unzipped the Seam distribution.</para>
@@ -406,41 +406,4 @@
incremental hot deployment for EAR projects.</para>
</section>
- <section>
- <title>Using Seam with JBoss 4.0</title>
-
- <para> Seam 2.0 was developed for JavaServer Faces 1.2. When using JBoss AS, we recommend using JBoss 4.2, which
- bundles the JSF 1.2 reference implementation. However, it is still possible to use Seam 2.0 on the JBoss 4.0
- platform. There are two basic steps required to do this: install an EJB3-enabled version of JBoss 4.0 and
- replace MyFaces with the JSF 1.2 reference implementation. Once you complete these steps, Seam 2.0
- applications can be deployed to JBoss 4.0.</para>
-
- <section>
- <title>Install JBoss 4.0</title>
- <para>JBoss 4.0 does not ship a default configuration compatible with Seam. To run Seam, you must install
- JBoss 4.0.5 using the JEMS 1.2 installer with the ejb3 profile selected. Seam will not run with an
- installation that doesn't include EJB3 support. The JEMS installer can be downloaded from <ulink
- url="http://labs.jboss.com/jemsinstaller/downloads"
- >http://labs.jboss.com/jemsinstaller/downloads</ulink>. </para>
- </section>
-
- <section>
- <title>Install the JSF 1.2 RI</title>
-
- <para> The web configuration for JBoss 4.0 can be found in the
- <literal>server/default/deploy/jbossweb-tomcat55.sar</literal>. You'll need to delete
- <literal>myfaces-api.jar</literal> any <literal>myfaces-impl.jar</literal> from the
- <literal>jsf-libs </literal>directory. Then, you'll need to copy <literal>jsf-api.jar</literal>,
- <literal>jsf-impl.jar</literal>, <literal>el-api.jar</literal>, and <literal>el-ri.jar</literal>
- to that directory. The JSF JARs can be found in the Seam <literal>lib</literal> directory. The el JARs
- can be obtained from the Seam 1.2 release. </para>
-
- <para>You'll also need to edit the <literal>conf/web.xml</literal>, replacing
- <literal>myfaces-impl.jar</literal> with <literal>jsf-impl.jar</literal>. </para>
- </section>
-
-
-
- </section>
-
</chapter>
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Hsearch.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Hsearch.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -60,7 +60,7 @@
</persistence-unit>]]></programlisting>
<para>If you plan to target Hibernate Annotations or EntityManager 3.2.x
- (embedded into JBoss AS 4.2.GA), you also need to configure the
+ (embedded into JBoss EAP AS 4.3), you also need to configure the
appropriate event listeners.</para>
<programlisting role="XML"><![CDATA[<persistence-unit name="sample">
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/I18n.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/I18n.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -33,8 +33,8 @@
parameters in the correct encoding from client requests you have to
configure the tomcat connector. If you use Tomcat or JBoss AS, add
the <literal>URIEncoding="UTF-8"</literal> attribute to the
- connector configuration. For JBoss AS 4.2 change
- <literal>${JBOSS_HOME}/server/(default)/deploy/jboss-web.deployer/server.xml</literal>:
+ connector configuration. For JBoss EAP AS 4.3 change
+ <literal>${JBOSS_HOME}/server/production/deploy/jboss-web.deployer/server.xml</literal>:
</para>
<programlisting role="XML"><Connector port="8080" URIEncoding="UTF-8"/></programlisting>
Modified: branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Tutorial.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Tutorial.xml 2008-10-27 20:52:43 UTC (rev 9453)
+++ branches/enterprise/JBPAPP_4_3_FP01/doc/Seam_Reference_Guide/en-US/Tutorial.xml 2008-10-27 21:44:08 UTC (rev 9454)
@@ -6,8 +6,7 @@
<section id="try-examples">
<title>Try the examples</title>
- <para> In this tutorial, we'll assume that you have downloaded JBoss AS 4.2. You should also have a copy of
- Seam downloaded and extracted to a work directory. </para>
+ <para> In this tutorial, we'll assume that you are using JBoss EAP 4.3.</para>
<para> The directory structure of each example in Seam follows this pattern: </para>
@@ -38,9 +37,10 @@
<title>Running the examples on JBoss AS</title>
<para> First, make sure you have Ant correctly installed, with <literal>$ANT_HOME</literal> and
- <literal>$JAVA_HOME</literal> set correctly. Next, make sure you set the location of your JBoss AS
- 4.2 installation in the <literal>build.properties</literal> file in the root folder of your Seam
- installation. If you haven't already done so, start JBoss AS now by typing <literal>bin/run.sh</literal>
+ <literal>$JAVA_HOME</literal> set correctly. Next, make sure you set the location of your EAP embedded JBoss AS
+ installation in the <literal>build.properties</literal> file in the root folder of your Seam
+ installation, predefined location is /var/lib/jboss-as. If you haven't already done so,
+ start JBoss AS now by typing <literal>bin/run.sh</literal>
or <literal>bin/run.bat</literal> in the root directory of your JBoss installation. </para>
<para> Now, build and deploy the example by typing <literal>ant deploy</literal> in the
16 years, 1 month
Seam SVN: r9453 - branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 16:52:43 -0400 (Mon, 27 Oct 2008)
New Revision: 9453
Modified:
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl
Log:
JBPAPP-1311
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java 2008-10-27 20:43:53 UTC (rev 9452)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java 2008-10-27 20:52:43 UTC (rev 9453)
@@ -2,9 +2,10 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.framework.EntityQuery;
+import @modelPackage@.@entityName@;
@Name("@listName@")
-public class @entityName@List extends EntityQuery
+public class @entityName@List extends EntityQuery<@entityName@>
{
@Override
public String getEjbql()
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl 2008-10-27 20:43:53 UTC (rev 9452)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl 2008-10-27 20:52:43 UTC (rev 9453)
@@ -13,7 +13,7 @@
import java.util.Arrays;
@Name("${listName}")
-public class ${entityName}List extends EntityQuery
+public class ${entityName}List extends EntityQuery<${entityName}>
{
private static final String[] RESTRICTIONS = {
16 years, 1 month
Seam SVN: r9452 - branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 16:43:53 -0400 (Mon, 27 Oct 2008)
New Revision: 9452
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/remote.js
Log:
JBPAPP-1321
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-10-27 19:55:01 UTC (rev 9451)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-10-27 20:43:53 UTC (rev 9452)
@@ -309,6 +309,13 @@
return;
types.add(type);
+
+ if (component.getName().contains("."))
+ {
+ componentSrc.append("Seam.Remoting.createNamespace('");
+ componentSrc.append(component.getName().substring(0, component.getName().lastIndexOf('.')));
+ componentSrc.append("');\n");
+ }
componentSrc.append("Seam.Remoting.type.");
componentSrc.append(component.getName());
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/remote.js
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/remote.js 2008-10-27 19:55:01 UTC (rev 9451)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/remote.js 2008-10-27 20:43:53 UTC (rev 9452)
@@ -139,6 +139,19 @@
}
}
+Seam.Remoting.createNamespace = function(namespace)
+{
+ var parts = namespace.split(".");
+ var base = Seam.Remoting.type;
+
+ for(var i = 0; i < parts.length; i++)
+ {
+ if (typeof base[parts[i]] == "undefined")
+ base[parts[i]] = new Object();
+ base = base[parts[i]];
+ }
+}
+
Seam.Remoting.__Context = function() {
this.conversationId = null;
16 years, 1 month
Seam SVN: r9451 - in branches/enterprise/JBPAPP_4_3_FP01/examples: groovybooking/resources/WEB-INF and 5 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-27 15:55:01 -0400 (Mon, 27 Oct 2008)
New Revision: 9451
Modified:
branches/enterprise/JBPAPP_4_3_FP01/examples/booking/resources/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/groovybooking/resources/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/hibernate/resources-jboss/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/icefaces/resources/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/resources-jboss/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/nestedbooking/resources/WEB-INF/pages.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml
Log:
JBPAPP-1299
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/booking/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/booking/resources/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/booking/resources/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -108,5 +108,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/groovybooking/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/groovybooking/resources/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/groovybooking/resources/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/hibernate/resources-jboss/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/icefaces/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/icefaces/resources/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/icefaces/resources/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -108,5 +108,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/resources-jboss/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/nestedbooking/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-10-27 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -131,5 +131,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
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 18:53:50 UTC (rev 9450)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/spring/resources/WEB-INF/pages.xml 2008-10-27 19:55:01 UTC (rev 9451)
@@ -100,5 +100,17 @@
</navigation>
</page>
+
+ <exception class="org.jboss.seam.security.NotLoggedInException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">You must be logged in to use this feature</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
16 years, 1 month
Seam SVN: r9450 - tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-27 14:53:50 -0400 (Mon, 27 Oct 2008)
New Revision: 9450
Modified:
tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/Component.java
Log:
merge 9420:9422 9448:9449 from trunk
Modified: tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/Component.java
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/Component.java 2008-10-27 18:42:33 UTC (rev 9449)
+++ tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/Component.java 2008-10-27 18:53:50 UTC (rev 9450)
@@ -945,6 +945,26 @@
if ( log.isDebugEnabled() ) log.debug("interceptor stack: " + interceptors);
}
+ public void addInterceptor(Object interceptorInstance)
+ {
+ try
+ {
+ addInterceptor(new Interceptor(interceptorInstance, this));
+ }
+ catch (NoClassDefFoundError e)
+ {
+ log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e);
+ }
+ catch (TypeNotPresentException e)
+ {
+ log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Unable to load interceptor " + interceptorInstance.getClass(), e);
+ }
+ }
+
public void addInterceptor(Interceptor interceptor)
{
if (interceptor.isInterceptorEnabled())
@@ -1021,12 +1041,22 @@
{
Class<?> clazz = Reflections.classForName(interceptorName);
interceptorInstance = clazz.newInstance();
+
}
+ catch (NoClassDefFoundError e)
+ {
+ log.debug("Unable to load interceptor " + interceptorName, e);
+ }
+ catch (TypeNotPresentException e)
+ {
+ log.debug("Unable to load interceptor " + interceptorName, e);
+ }
catch (Exception e)
{
throw new IllegalArgumentException("Unable to load interceptor " + interceptorName, e);
}
- addInterceptor(new Interceptor(interceptorInstance, this));
+ addInterceptor(interceptorInstance);
+
}
}
16 years, 1 month
Seam SVN: r9449 - in trunk: seam-gen and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-27 14:42:33 -0400 (Mon, 27 Oct 2008)
New Revision: 9449
Modified:
trunk/build/gen.pom.xml
trunk/build/root.pom.xml
trunk/seam-gen/build.xml
Log:
JBSEAM-3637
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-10-27 18:10:02 UTC (rev 9448)
+++ trunk/build/gen.pom.xml 2008-10-27 18:42:33 UTC (rev 9449)
@@ -70,6 +70,12 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-10-27 18:10:02 UTC (rev 9448)
+++ trunk/build/root.pom.xml 2008-10-27 18:42:33 UTC (rev 9449)
@@ -640,6 +640,22 @@
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.5.4</version>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-10-27 18:10:02 UTC (rev 9448)
+++ trunk/seam-gen/build.xml 2008-10-27 18:42:33 UTC (rev 9449)
@@ -607,18 +607,8 @@
<fileset file="${driver.jar}"/>
</copy>
- <!-- we must use an endorsed jars directory for running SeamTest under Java 6 -->
- <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
- <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
- <exclusion groupId="javax.xml.stream" artifactId="stax-api"/>
- <exclusion groupId="javax.activation" artifactId="activation"/>
- </dependency>
- <remoteRepository refId="repository.jboss.org"/>
- </artifact:dependencies>
- <copy todir="${project.home}/lib/endorsed" overwrite="true">
- <fileset refid="endorsed.fileset"/>
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten"/>
- </copy>
+ <!-- we must use an endorsed jars directory containing JAXB 2.1 for running SeamTest under Java 6 -->
+ <copy todir="${project.home}/lib/endorsed" file="${seam.dir}/lib/gen/jaxb-api.jar" overwrite="true"/>
<echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..."/>
<copy todir="${project.home}/bootstrap" overwrite="true">
16 years, 1 month
Seam SVN: r9448 - in tags/JBoss_Seam_2_1_0_SP1: seam-gen/view and 2 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-27 14:10:02 -0400 (Mon, 27 Oct 2008)
New Revision: 9448
Modified:
tags/JBoss_Seam_2_1_0_SP1/seam
tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl
tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl
tags/JBoss_Seam_2_1_0_SP1/seam.bat
tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml
tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml
tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java
Log:
merge trunk -r9389:9390 -r9396:9401 -r9404:9405
Modified: tags/JBoss_Seam_2_1_0_SP1/seam
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam 2008-10-27 18:10:02 UTC (rev 9448)
@@ -1,16 +1,17 @@
#!/bin/sh
-############################################
-#
-# seam-gen - Seam project and code generator
-#
-############################################
+##############################################
+# #
+# seam-gen - Seam project and code generator #
+# #
+############################################ #
+
# Validate the JDK installation
if [ -z "$JAVA_HOME" ]; then
echo "The JAVA_HOME environment variable is not set"
- echo "Please point it to a valid JDK installation"
+ echo "Please point it to a JDK installation"
exit 1
-elif [ ! -x "$JAVA_HOME"/bin/javac ]; then
+elif [ ! -x "$JAVA_HOME/bin/javac" ]; then
echo "The JAVA_HOME environment variable should point to a JDK, not a JRE"
exit 1
fi
@@ -32,12 +33,11 @@
fi
SEAM_GEN_DIR="$SEAM_HOME/seam-gen"
-SEAM_COMMAND="${1}"
+SEAM_COMMAND="$1"
-echo "Location of seam script: $SEAM_HOME"
-echo "seam-gen template folder: $SEAM_GEN_DIR"
+echo "SEAM_HOME: $SEAM_HOME"
+echo "Using seam-gen sources from: $SEAM_GEN_DIR"
-# OS specific support (must be 'true' or 'false').
cygwin=false;
case "`uname`" in
CYGWIN*)
@@ -50,7 +50,12 @@
elif [ "$SEAM_COMMAND" = help ]; then
cat "$SEAM_GEN_DIR/README"
elif $cygwin; then
- java -cp "${JAVA_HOME}\lib\tools.jar;${SEAM_HOME}\build\lib\ant-launcher.jar;${SEAM_HOME}\build\lib\ant-nodeps.jar;${SEAM_HOME}\build\lib\ant.jar" -Dant.home="${SEAM_HOME}\lib" org.apache.tools.ant.launch.Launcher -buildfile "${SEAM_GEN_DIR}\build.xml" -Dworking.dir="$WORKING_DIR" ${*}
+ # Must pass real Windows paths to Java (Java doesn't execute in the context of cgywin)
+ JAVA_HOME_WINPATH=`cygpath -aw "$JAVA_HOME"`
+ SEAM_HOME_WINPATH=`cygpath -aw "$SEAM_HOME"`
+ SEAM_GEN_DIR_WINPATH=`cygpath -aw "$SEAM_GEN_DIR"`
+ WORKING_DIR_WINPATH=`cygpath -aw "$WORKING_DIR"`
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\build\lib\ant-launcher.jar;$SEAM_HOME_WINPATH\build\lib\ant-nodeps.jar;$SEAM_HOME_WINPATH\build\lib\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@"
else
- java -cp "${JAVA_HOME}/lib/tools.jar:${SEAM_HOME}/build/lib/ant-launcher.jar:${SEAM_HOME}/build/lib/ant-nodeps.jar:${SEAM_HOME}/build/lib/ant.jar" -Dant.home="${SEAM_HOME}/lib" org.apache.tools.ant.launch.Launcher -buildfile "${SEAM_GEN_DIR}/build.xml" -Dworking.dir="$WORKING_DIR" ${*}
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/build/lib/ant-launcher.jar:$SEAM_HOME/build/lib/ant-nodeps.jar:$SEAM_HOME/build/lib/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@"
fi
Modified: tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl 2008-10-27 18:10:02 UTC (rev 9448)
@@ -124,7 +124,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
Modified: tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl 2008-10-27 18:10:02 UTC (rev 9448)
@@ -97,7 +97,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
Modified: tags/JBoss_Seam_2_1_0_SP1/seam.bat
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam.bat 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam.bat 2008-10-27 18:10:02 UTC (rev 9448)
@@ -1,41 +1,63 @@
@echo off
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
+@if "%OS%" == "Windows_NT" setlocal
+rem ##############################################
+rem # #
+rem # seam-gen - Seam project and code generator #
+rem # #
+rem ##############################################
+
set WORKING_DIR=%CD%
-set SEAM_DIR=%~dp0
-if "%SEAM_DIR:~-1%" == "\" set SEAM_DIR=%SEAM_DIR:~0,-1%
-set SEAM_GEN_DIR=%SEAM_DIR%\seam-gen
+if "%WORKING_DIR:~-1%" == "\" (
+ set WORKING_DIR=%WORKING_DIR:~0,-1%
+)
+
+if ["%SEAM_HOME%"] == [""] (
+ set SEAM_HOME=%~dp0
+) else (
+ if not exist "%SEAM_HOME\seam.bat" (goto noseam)
+)
+if "%SEAM_HOME:~-1%" == "\" (
+ set SEAM_HOME=%SEAM_HOME:~0,-1%
+)
+
+set SEAM_GEN_DIR=%SEAM_HOME%\seam-gen
set COMMAND=%1%
-set ARGS=%*
if [%COMMAND%] == [] (goto usage)
if %COMMAND% == help (goto help)
-if ["%JAVA_HOME%"] == [] (goto nojava)
+if ["%JAVA_HOME%"] == [""] (goto nojava)
if not exist "%JAVA_HOME%\bin\javac.exe" (goto nojdk)
-java -cp "%JAVA_HOME%\lib\tools.jar;%SEAM_DIR%\build\lib\ant-launcher.jar;%SEAM_DIR%\build\lib\ant-nodeps.jar;%SEAM_DIR%\build\lib\ant.jar" -Dant.home="%SEAM_DIR%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAM_GEN_DIR%\build.xml" -Dworking.dir=%WORKING_DIR% %ARGS%
+echo SEAM_HOME: %SEAM_HOME%
+echo Using seam-gen sources from: %SEAM_GEN_DIR%
+"%JAVA_HOME%\bin\java" -cp "%JAVA_HOME%\lib\tools.jar;%SEAM_HOME%\build\lib\ant-launcher.jar;%SEAM_HOME%\build\lib\ant-nodeps.jar;%SEAM_HOME%\build\lib\ant.jar" -Dant.home="%SEAM_HOME%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAM_GEN_DIR%\build.xml" -Dworking.dir="%WORKING_DIR%" %*
+
goto END_NO_PAUSE
:nojava
echo The JAVA_HOME environment variable is not set
-echo Please point it to a valid JDK installation
+echo Please point it to a JDK installation
goto END_NO_PAUSE
:nojdk
echo The JAVA_HOME environment variable should point to a JDK, not a JRE
goto END_NO_PAUSE
+:noseam
+echo The SEAM_HOME environment variable should point to a Seam distribution
+goto END_NO_PAUSE
+
:usage
-more %SEAM_GEN_DIR%\USAGE
+more "%SEAM_GEN_DIR%\USAGE"
goto END_NO_PAUSE
:help
-more %SEAM_GEN_DIR%\README
+more "%SEAM_GEN_DIR%\README"
goto END_NO_PAUSE
-:END_NO_PAUSE
\ No newline at end of file
+:END_NO_PAUSE
Modified: tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml 2008-10-27 18:10:02 UTC (rev 9448)
@@ -84,10 +84,6 @@
<component-type>org.jboss.seam.excel.ui.command.UIRowPageBreak</component-type>
<component-class>org.jboss.seam.excel.ui.command.UIRowPageBreak</component-class>
</component>
- <component>
- <component-type>org.jboss.seam.excel.ui.UIExcelExport</component-type>
- <component-class>org.jboss.seam.excel.ui.UIExcelExport</component-class>
- </component>
<component>
<component-type>org.jboss.seam.excel.ui.UILink</component-type>
<component-class>org.jboss.seam.excel.ui.UILink</component-class>
Modified: tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml 2008-10-27 18:10:02 UTC (rev 9448)
@@ -146,13 +146,6 @@
</component>
</tag>
- <tag>
- <tag-name>excelExport</tag-name>
- <component>
- <component-type>org.jboss.seam.excel.ui.UIExcelExport</component-type>
- </component>
- </tag>
-
<tag>
<tag-name>debug</tag-name>
<component>
Modified: tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java 2008-10-27 18:10:02 UTC (rev 9448)
@@ -4,12 +4,12 @@
import static org.jboss.seam.ComponentType.STATELESS_SESSION_BEAN;
import javax.annotation.PostConstruct;
-import javax.ejb.PostActivate;
import org.hibernate.Session;
import org.jboss.seam.Component.BijectedAttribute;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
+import org.jboss.seam.annotations.intercept.PostActivate;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.util.Reflections;
16 years, 1 month
Seam SVN: r9447 - in tags/JBoss_Seam_2_1_0_SP1: build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-27 14:02:12 -0400 (Mon, 27 Oct 2008)
New Revision: 9447
Modified:
tags/JBoss_Seam_2_1_0_SP1/build/default.build.properties
tags/JBoss_Seam_2_1_0_SP1/readme.txt
Log:
version
Modified: tags/JBoss_Seam_2_1_0_SP1/build/default.build.properties
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/build/default.build.properties 2008-10-27 17:59:40 UTC (rev 9446)
+++ tags/JBoss_Seam_2_1_0_SP1/build/default.build.properties 2008-10-27 18:02:12 UTC (rev 9447)
@@ -8,7 +8,7 @@
major.version 2
minor.version .1
patchlevel .0
-qualifier .GA
+qualifier .SP1
#
# Other program locations
# -----------------------
Modified: tags/JBoss_Seam_2_1_0_SP1/readme.txt
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/readme.txt 2008-10-27 17:59:40 UTC (rev 9446)
+++ tags/JBoss_Seam_2_1_0_SP1/readme.txt 2008-10-27 18:02:12 UTC (rev 9447)
@@ -1,7 +1,7 @@
JBoss Seam - Contextual Component framework for Java EE 5
=========================================================
-version 2.1.1.GA, October 2008
+version 2.1.0.SP1, November 2008
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
16 years, 1 month