Seam SVN: r12164 - in modules/remoting/trunk: core and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-10 19:02:50 -0500 (Wed, 10 Mar 2010)
New Revision: 12164
Modified:
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/docs/pom.xml
modules/remoting/trunk/examples/helloworld/pom.xml
modules/remoting/trunk/examples/model/pom.xml
modules/remoting/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: modules/remoting/trunk/core/pom.xml
===================================================================
--- modules/remoting/trunk/core/pom.xml 2010-03-11 00:02:29 UTC (rev 12163)
+++ modules/remoting/trunk/core/pom.xml 2010-03-11 00:02:50 UTC (rev 12164)
@@ -4,12 +4,12 @@
<parent>
<artifactId>seam-remoting-parent</artifactId>
<groupId>org.jboss.seam.remoting</groupId>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Seam Remoting Core</name>
Modified: modules/remoting/trunk/docs/pom.xml
===================================================================
--- modules/remoting/trunk/docs/pom.xml 2010-03-11 00:02:29 UTC (rev 12163)
+++ modules/remoting/trunk/docs/pom.xml 2010-03-11 00:02:50 UTC (rev 12164)
@@ -9,7 +9,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-reference-guide</artifactId>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Seam Remoting Reference Guide</name>
@@ -120,9 +120,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta...</developerConnection>
- <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs/tags/3.0.0-Bet...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk/docs</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk/docs</developerConnection>
+ <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs</url>
</scm>
</project>
Modified: modules/remoting/trunk/examples/helloworld/pom.xml
===================================================================
--- modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:02:29 UTC (rev 12163)
+++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:02:50 UTC (rev 12164)
@@ -5,7 +5,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>remoting-helloworld-example</artifactId>
<packaging>war</packaging>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Helloworld Example</name>
<dependencies>
Modified: modules/remoting/trunk/examples/model/pom.xml
===================================================================
--- modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:02:29 UTC (rev 12163)
+++ modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:02:50 UTC (rev 12164)
@@ -5,7 +5,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-model-example</artifactId>
<packaging>war</packaging>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Model Example</name>
<dependencies>
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2010-03-11 00:02:29 UTC (rev 12163)
+++ modules/remoting/trunk/pom.xml 2010-03-11 00:02:50 UTC (rev 12164)
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -10,7 +10,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-parent</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-Beta1</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Parent</name>
<modules>
@@ -81,9 +81,9 @@
</dependencyManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta1</developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/tags/3.0.0-Beta1</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
</scm>
</project>
14 years, 1 month
Seam SVN: r12163 - modules/remoting/tags.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-10 19:02:29 -0500 (Wed, 10 Mar 2010)
New Revision: 12163
Added:
modules/remoting/tags/3.0.0-Beta1/
Log:
[maven-scm] copy for tag 3.0.0-Beta1
Copied: modules/remoting/tags/3.0.0-Beta1 (from rev 12162, modules/remoting/trunk)
14 years, 1 month
Seam SVN: r12162 - in modules/remoting/trunk: core and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-10 19:01:45 -0500 (Wed, 10 Mar 2010)
New Revision: 12162
Modified:
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/docs/pom.xml
modules/remoting/trunk/examples/helloworld/pom.xml
modules/remoting/trunk/examples/model/pom.xml
modules/remoting/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 3.0.0-Beta1
Modified: modules/remoting/trunk/core/pom.xml
===================================================================
--- modules/remoting/trunk/core/pom.xml 2010-03-10 22:34:22 UTC (rev 12161)
+++ modules/remoting/trunk/core/pom.xml 2010-03-11 00:01:45 UTC (rev 12162)
@@ -1,16 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>seam-remoting-parent</artifactId>
<groupId>org.jboss.seam.remoting</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
<packaging>jar</packaging>
<name>Seam Remoting Core</name>
Modified: modules/remoting/trunk/docs/pom.xml
===================================================================
--- modules/remoting/trunk/docs/pom.xml 2010-03-10 22:34:22 UTC (rev 12161)
+++ modules/remoting/trunk/docs/pom.xml 2010-03-11 00:01:45 UTC (rev 12162)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -10,7 +9,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-reference-guide</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
<packaging>jdocbook</packaging>
<name>Seam Remoting Reference Guide</name>
@@ -121,9 +120,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk/docs</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk/docs</developerConnection>
- <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/seam/modules/remoting/docs/tags/3.0.0-Bet...</url>
</scm>
</project>
Modified: modules/remoting/trunk/examples/helloworld/pom.xml
===================================================================
--- modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-10 22:34:22 UTC (rev 12161)
+++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-03-11 00:01:45 UTC (rev 12162)
@@ -5,7 +5,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>remoting-helloworld-example</artifactId>
<packaging>war</packaging>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
<name>Seam Remoting Helloworld Example</name>
<dependencies>
Modified: modules/remoting/trunk/examples/model/pom.xml
===================================================================
--- modules/remoting/trunk/examples/model/pom.xml 2010-03-10 22:34:22 UTC (rev 12161)
+++ modules/remoting/trunk/examples/model/pom.xml 2010-03-11 00:01:45 UTC (rev 12162)
@@ -5,7 +5,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-model-example</artifactId>
<packaging>war</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
<name>Seam Remoting Model Example</name>
<dependencies>
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
</dependency>
<dependency>
Modified: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2010-03-10 22:34:22 UTC (rev 12161)
+++ modules/remoting/trunk/pom.xml 2010-03-11 00:01:45 UTC (rev 12162)
@@ -1,7 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -13,7 +10,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-parent</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-Beta1</version>
<name>Seam Remoting Parent</name>
<modules>
@@ -84,9 +81,9 @@
</dependencyManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/tags/3.0.0-Beta1</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/tags/3.0.0-Beta1</url>
</scm>
</project>
14 years, 1 month
Seam SVN: r12161 - in modules/xml/trunk: examples/princess-rescue/src/main/resources/META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-10 17:34:22 -0500 (Wed, 10 Mar 2010)
New Revision: 12161
Modified:
modules/xml/trunk/docs/en-US/xml-general.xml
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
Log:
updated docs to refer to beans.xml instead of seam-beans.xml
Modified: modules/xml/trunk/docs/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 21:24:24 UTC (rev 12160)
+++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 22:34:22 UTC (rev 12161)
@@ -19,53 +19,52 @@
<itemizedlist>
<listitem><para><literal>/WEB-INF/beans.xml</literal></para></listitem>
<listitem><para><literal>/META-INF/beans.xml</literal></para></listitem>
- <listitem><para>/seam-beans.xml</para></listitem>
<listitem><para><literal>/WEB-INF/seam-beans.xml</literal></para></listitem>
<listitem><para><literal>/META-INF/seam-beans.xml</literal></para></listitem>
</itemizedlist>
- <para>The syntax for beans.xml and seam-beans.xml is slightly different. Unless otherwise noted all example in this document
- use the seam-beans.xml format. Using beans.xml may cause problems with some JSR-299 implmentations.</para>
+ <para>The beans.xml file is the preferred way of configuring beans via XML, however it may be possible that some JSR-299 implementations will not allow this,
+ so seam-beans.xml is provided as an alternative. </para>
<para>Lets start with a simple example</para>
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:seam:core"
+ xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
<test:ProducerQualifier>
- <Qualifier/>
+ <s:Qualifier/>
</test:ProducerQualifier>
<test:ProducerBean>
<test:value>
- <Produces/>
+ <s:Produces/>
<test:ProducerQualifier/>
- <value>hello world</value>
+ <s:value>hello world</s:value>
</test:value>
</test:ProducerBean>
<test:RecieverBean>
<test:value>
<test:ProducerQualifier/>
- <Inject/>
+ <s:Inject/>
</test:value>
</test:RecieverBean>
</beans>
]]>
</programlisting>
- <para>From the top:</para>
-
-
- <para>The root element of the file has to be <literal><Beans/></literal>, and the root namespace should be <literal>urn:java:seam:core</literal>.
- You will also notice that there is a second namespace defined, <literal>urn:java:org.jboss.seam.xml.test.injection</literal>, this namespace is used
- to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>.</para>
+ <para>You will notice that two new namspace declarations have been added to the beans.xml file: <literal>urn:java:seam:core</literal> and <literal>urn:java:org.jboss.seam.xml.test.injection</literal>.
+ <literal>urn:java:seam:core</literal> is the main namespace used by the XML extension, we will cover exactly what lives in this namespace later.
+ <literal>urn:java:org.jboss.seam.xml.test.injection</literal> is used to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>, so in the exaple above
+ <literal><test:ProducerBean></literal> resolves to <literal>org.jboss.seam.xml.test.injection.ProducerBean</literal>.</para>
<programlisting>
<![CDATA[
<test:ProducerQualifier>
- <Qualifier/>
+ <s:Qualifier/>
</test:ProducerQualifier>
]]>
</programlisting>
@@ -76,9 +75,9 @@
<![CDATA[
<test:ProducerBean>
<test:value>
- <Produces/>
+ <s:Produces/>
<test:ProducerQualifier/>
- <value>hello world</value>
+ <s:value>hello world</s:value>
</test:value>
</test:ProducerBean>
]]>
@@ -86,12 +85,12 @@
<para>The next entry in the file is a bean declaration. The bean class is <literal>org.jboss.seam.xml.test.injection.ProducerBean</literal>.
It is important to note that this declaration does not change the existing declaration of ProducerBean, instead it installs a new bean. In
- this instance there will be two ProducerBean CDI beans.</para>
+ this instance there will be two <literal>ProducerBean</literal> CDI beans.</para>
- <para>This bean has a field called 'value', this field is configured to be a producer field using XML (it is also possible to configure producer
- methods, more on this later). The <literal><test:value/></literal> declaration has several child elements. The <literal><Produces/></literal>
+ <para>This bean has a field called <literal>value</literal>, this field is configured to be a producer field using XML (it is also possible to configure producer
+ methods, more on this later). The <literal><test:value/></literal> declaration has several child elements. The <literal><s:Produces/></literal>
element tells the container that this is a producer field. <literal><test:ProducerQualifier/></literal> element defines a qualifier for the producer
- field. The <literal><value></literal> element defines an initial value for the field.</para>
+ field. The <literal><s:value></literal> element defines an initial value for the field.</para>
<para>Child elements of fields, methods and classes that resolve to Annotation types are considered to be annotations on the corresponding element,
so the corresponding java declaration for the XML above would be:</para>
@@ -111,7 +110,7 @@
<test:RecieverBean>
<test:value>
<test:ProducerQualifier/>
- <Inject/>
+ <s:Inject/>
</test:value>
</test:RecieverBean>
]]>
@@ -122,8 +121,8 @@
</section>
<section>
- <title>The root namespace</title>
- <para>The root namesapce can contain the following elements:</para>
+ <title>The main namespace</title>
+ <para>The main namesapce is <literal>urn:java:seam:core</literal> can contain the following elements:</para>
<itemizedlist>
<listitem><para><literal>Beans</literal></para></listitem>
@@ -161,25 +160,25 @@
<listitem><para><literal>javax.interceptor</literal></para></listitem>
</itemizedlist>
- <para>So the <literal><Produces></literal> element above actually resolved to <literal>java.enterprise.inject.Produces</literal>
- and the <literal><Inject></literal> element resolved to <literal>javax.inject.Inject</literal>.</para>
+ <para>So the <literal><s:Produces></literal> element above actually resolved to <literal>java.enterprise.inject.Produces</literal>
+ and the <literal><s:Inject></literal> element resolved to <literal>javax.inject.Inject</literal>.</para>
</section>
<section>
<title>Overriding and extending beans</title>
- <para>The may be cases where you want to modify an existing bean rather that adding a new one. The <literal><override></literal> and <literal><extends></literal>
- tags allow you to do this. The <literal><override></literal> tag prevents the existing bean from being installed, and registers a new one with the given configuration.
- The <literal><extends></literal> tag allows you to add extra configuration to an existing bean.</para>
+ <para>The may be cases where you want to modify an existing bean rather that adding a new one. The <literal><s:override></literal> and <literal><s:extends></literal>
+ tags allow you to do this. The <literal><s:override></literal> tag prevents the existing bean from being installed, and registers a new one with the given configuration.
+ The <literal><s:extends></literal> tag allows you to add extra configuration to an existing bean.</para>
<programlisting>
<![CDATA[
<test:MyBean>
- <extends>
+ <s:extends>
<test:NewQualifier/>
</test:MyBean>
<test:OtherBean>
- <override>
+ <s:override>
<test:NewQualifier/>
</test:OtherBean>
]]>
@@ -189,7 +188,7 @@
<section>
<title>Initial Field Values</title>
- <para>Inital field values can be set in two different ways, in addition to the <literal><value></literal> element shown above it can be set as follows:</para>
+ <para>Inital field values can be set in two different ways, in addition to the <literal><s:value></literal> element shown above it can be set as follows:</para>
<programlisting>
<![CDATA[
<test:someField>hello world</test:someField>
@@ -203,27 +202,27 @@
<![CDATA[
<test:ArrayFieldValue>
<test:iarray>
- <value>1</value>
- <value>2</value>
+ <s:value>1</s:value>
+ <s:value>2</s:value>
</test:iarray>
<test:carray>
- <value>java.lang.Integer</value>
- <value>java.lang.Long</value>
+ <s:value>java.lang.Integer</s:value>
+ <s:value>java.lang.Long</s:value>
</test:carray>
<test:sarray>
- <value>hello</value>
- <value>world</value>
+ <s:value>hello</s:value>
+ <s:value>world</s:value>
</test:sarray>
</test:ArrayFieldValue>
<test:MapFieldValue>
<test:map1>
- <entry><key>1</key><value>hello</value></entry>
- <entry><key>2</key><value>world</value></entry>
+ <s:entry><s:key>1</s:key><s:value>hello</s:value></s:entry>
+ <s:entry><s:key>2</s:key><s:value>world</s:value></s:entry>
</test:map1>
<test:map2>
- <e><k>1</k><v>java.lang.Integer</v></e>
- <e><k>2</k><v>java.lang.Long</v></e>
+ <s:e><s:k>1</s:k><s:v>java.lang.Integer</s:v></s:e>
+ <s:e><s:k>2</s:k><s:v>java.lang.Long</s:v></s:e>
</test:map2>
</test:MapFieldValue>
]]>
@@ -240,30 +239,32 @@
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.method">
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:seam:core"
+ xmlns:test="urn:java:org.jboss.seam.xml.test.method">
<test:MethodBean>
<test:method>
- <Produces/>
+ <s:Produces/>
</test:method>
<test:method>
- <Produces/>
+ <s:Produces/>
<test:Qualifier1/>
- <parameters>
+ <s:parameters>
<test:MethodValueBean>
<test:Qualifier2/>
</test:MethodValueBean>
- </parameters>
+ </s:parameters>
</test:method>
<test:method>
- <Produces/>
+ <s:Produces/>
<test:Qualifier1/>
- <parameters>
- <array dimensions="2">
+ <s:parameters>
+ <s:array dimensions="2">
<test:Qualifier2/>
<test:MethodValueBean/>
- </array>
- </parameters>
+ </s:array>
+ </s:parameters>
</test:method>
</test:MethodBean>
</beans>
@@ -293,9 +294,9 @@
<para>In this instance <literal>MethodBean</literal> has three methods, all of them rather imaginatively named <literal>method</literal>.
The first <literal><test:method></literal> entry in the XML file configures the method that takes no arguments.
- The <literal><Produces></literal> element makes it into a producer method. The next entry in the file configures
+ The <literal><s:Produces></literal> element makes it into a producer method. The next entry in the file configures
the method that takes a <literal>MethodValueBean</literal> as a parameter. The final entry configures a method that takes a two
- dimensional array of<literal>MethodValueBean</literal>'s as a parameter. Method Parameters a specified inside the <literal><parameters></literal>
+ dimensional array of<literal>MethodValueBean</literal>'s as a parameter. Method Parameters a specified inside the <literal><s:parameters></literal>
tag. If these parameters have annotation children they are taken to be annotations on the parameter. </para>
<para>The corresponding java declaration for the xml above would be:</para>
@@ -313,7 +314,7 @@
public int method(@Qualifier2 MethodValueBean[][] param) {//method body}
]]>
</programlisting>
- <para>Array parameters can be represented using the <literal><array></literal> element, with a child element to
+ <para>Array parameters can be represented using the <literal><s:array></literal> element, with a child element to
represent the type of the array. E.g.</para>
<programlisting>
int method(MethodValueBean[] param);
@@ -322,9 +323,9 @@
<programlisting>
<![CDATA[
<test:method>
- <array>
+ <s:array>
<test:MethodValueBean/>
- </array>
+ </s:array>
</test:method>
]]>
</programlisting>
@@ -356,45 +357,7 @@
</programlisting>
<para>The value member can be set using the inner text of the node, as seen in the first example.</para>
</section>
-
- <section>
- <title>Using beans.xml instead of seam-beans.xml</title>
- <para>
- As the format is beans.xml is defined by the specification the format is slightly different:
- </para>
- <programlisting>
- <![CDATA[
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
- <interceptors>
- <class>org.jboss.seam.xml.test.interceptor.InterceptorBean</class>
- </interceptors>
-
- <test:InterceptorBinding>
- <s:InterceptorBinding/>
- </test:InterceptorBinding>
- <test:InterceptorBean>
- <s:override/>
- <s:Interceptor/>
- <test:InterceptorBinding/>
- <test:myMethod>
- <s:AroundInvoke/>
- </test:myMethod>
- </test:InterceptorBean>
-
-</beans>
-]]>
- </programlisting>
- <para>As you can see from the example above the beans.xml uses a different root namespace, so all elements in <literal>urn:seam:core </literal>
- must be qualified. It is possible that some JST-299 implementations will not support this, so for maximum compatibility it is recommended that
- seam-beans.xml be used instead.</para>
- </section>
-
<section>
<title>More Information</title>
<para>For further information look at the units tests in the seam-xml distribution, also the JSR-299
Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-03-10 21:24:24 UTC (rev 12160)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-03-10 22:34:22 UTC (rev 12161)
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The contents of this file is permitted to be empty.
- The schema definition is provided for your convenience.
--->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:s="urn:java:seam:core"
14 years, 1 month
Seam SVN: r12160 - modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-10 16:24:24 -0500 (Wed, 10 Mar 2010)
New Revision: 12160
Removed:
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml
Modified:
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
Log:
moved example over to useing beans.xml
Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-03-10 21:24:24 UTC (rev 12160)
@@ -5,7 +5,194 @@
-->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:seam:core"
+ xmlns:p="org.jboss.seam.xml.examples.princess"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+ <!-- Makes the Room annotation a qualifier -->
+ <p:Room>
+ <s:Qualifier/>
+ </p:Room>
+
+ <p:GameManager>
+ <s:extends/>
+ <p:allRooms>
+ <s:Any/>
+ <s:Inject/>
+ </p:allRooms>
+ <p:emptyRoomShootMessage>Your arrow does not appear to hit anything.</p:emptyRoomShootMessage>
+ <p:startMessage>You enter the dungeon, with you bow in your hand and your heart in your mouth.</p:startMessage>
+ <p:startRoom>
+ <!-- Inject the starting room -->
+ <s:Inject/>
+ <p:Room>startRoom</p:Room>
+ </p:startRoom>
+ </p:GameManager>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room value="startRoom"/>
+ <p:north><s:Inject/><p:Room>emptyRoom1</p:Room></p:north>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom1</p:Room>
+ <p:north><s:Inject/><p:Room>emptyRoom3</p:Room></p:north>
+ <p:west><s:Inject/><p:Room>dwarfRoom</p:Room></p:west>
+ <p:east><s:Inject/><p:Room>pitRoom1</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>startRoom</p:Room></p:south>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>dwarfRoom</p:Room>
+ <p:roomType>MONSTER</p:roomType>
+ <p:shootEffect>KILL</p:shootEffect>
+ <p:adjacentMessage>You hear drunken singing.</p:adjacentMessage>
+ <p:message>You find a drunken dwarven miner. He belches in your direction, falls over, then seems to forget you are there.</p:message>
+ <p:shootMessage>You hear a 'Thud', followed by a surprised yell.</p:shootMessage>
+ <p:killedRoomMessage>You find a dead dwarven miner with something that looks suspiciously like one of your arrows sticking out of his chest. Probably best you don't mention this to anyone...</p:killedRoomMessage>
+ <p:east><s:Inject/><p:Room>emptyRoom1</p:Room></p:east>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>pitRoom1</p:Room>
+ <p:roomType>GAMEOVER</p:roomType>
+ <p:adjacentMessage>You feel a breeze.</p:adjacentMessage>
+ <p:message>You fall into a bottomless pit. Game Over. </p:message>
+ <p:west><s:Inject/><p:Room>emptyRoom1</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom2</p:Room>
+ <p:north><s:Inject/><p:Room>emptyRoom4</p:Room></p:north>
+ <p:west><s:Inject/><p:Room>pitRoom1</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom3</p:Room>
+ <p:north><s:Inject/><p:Room>pitRoom2</p:Room></p:north>
+ <p:east><s:Inject/><p:Room>batRoom</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>emptyRoom1</p:Room></p:south>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>batRoom</p:Room>
+ <p:adjacentMessage>You hear a screeching noise.</p:adjacentMessage>
+ <p:message>A swarm of bats lands on you and tries to pick you up. They fail miserably. You swat them away with your bow.</p:message>
+ <p:shootMessage>You seem to have disturbed some bats, they fly past your head in the dark.</p:shootMessage>
+ <p:north><s:Inject/><p:Room>emptyRoom6</p:Room></p:north>
+ <p:east><s:Inject/><p:Room>emptyRoom4</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>pitRoom1</p:Room></p:south>
+ <p:west><s:Inject/><p:Room>emptyRoom3</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom4</p:Room>
+ <p:east><s:Inject/><p:Room>emptyRoom5</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>emptyRoom2</p:Room></p:south>
+ <p:west><s:Inject/><p:Room>batRoom</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom5</p:Room>
+ <p:north><s:Inject/><p:Room>emptyRoom7</p:Room></p:north>
+ <p:east><s:Inject/><p:Room>dragonRoom</p:Room></p:east>
+ <p:west><s:Inject/><p:Room>emptyRoom4</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>dragonRoom</p:Room>
+ <p:adjacentMessage>You hear a snoring noise. With every snore you see a flickering light, as if something were breathing flames from its nostrils.</p:adjacentMessage>
+ <p:roomType>GAMEOVER</p:roomType>
+ <p:message>The dragon wakes up as you enter. Then it eats you.</p:message>
+ <p:shootEffect>ANNOY</p:shootEffect>
+ <p:shootMessage>Your arrow wakes up the dragon, without appearing to do any real damage. The last moments of your life are spent running from an angry dragon.</p:shootMessage>
+ <p:north><s:Inject/><p:Room>princessRoom</p:Room></p:north>
+ <p:west><s:Inject/><p:Room>emptyRoom5</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>pitRoom2</p:Room>
+ <p:roomType>GAMEOVER</p:roomType>
+ <p:adjacentMessage>You feel a breeze.</p:adjacentMessage>
+ <p:message>You fall into a bottomless pit. Game Over. </p:message>
+ <p:south><s:Inject/><p:Room>emptyRoom3</p:Room></p:south>
+ <p:east><s:Inject/><p:Room>emptyRoom6</p:Room></p:east>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom6</p:Room>
+ <p:north><s:Inject/><p:Room>emptyRoom8</p:Room></p:north>
+ <p:west><s:Inject/><p:Room>pitRoom2</p:Room></p:west>
+ <p:south><s:Inject/><p:Room>batRoom</p:Room></p:south>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom7</p:Room>
+ <p:north><s:Inject/><p:Room>emptyRoom10</p:Room></p:north>
+ <p:east><s:Inject/><p:Room>princessRoom</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>emptyRoom5</p:Room></p:south>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>princessRoom</p:Room>
+ <p:adjacentMessage>You hear a sobbing noise.</p:adjacentMessage>
+ <p:roomType>GAMEOVER</p:roomType>
+ <p:message>You find the princess and quickly free her, and then escape from the dungeon. You both live happily ever after.</p:message>
+ <p:shootEffect>ANNOY</p:shootEffect>
+ <p:shootMessage>Your arrow clatters against the wall. You hear a cry 'Help i'm being shot at'. The cry wakes the dragon in the room next door, which promptly eats you.</p:shootMessage>
+ <p:south><s:Inject/><p:Room>dragonRoom</p:Room></p:south>
+ <p:west><s:Inject/><p:Room>emptyRoom7</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom8</p:Room>
+ <p:east><s:Inject/><p:Room>emptyRoom9</p:Room></p:east>
+ <p:south><s:Inject/><p:Room>emptyRoom6</p:Room></p:south>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom9</p:Room>
+ <p:north><s:Inject/><p:Room>wumpusRoom</p:Room></p:north>
+ <p:east><s:Inject/><p:Room>emptyRoom10</p:Room></p:east>
+ <p:west><s:Inject/><p:Room>emptyRoom8</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:Room>emptyRoom10</p:Room>
+ <p:south><s:Inject/><p:Room>emptyRoom7</p:Room></p:south>
+ <p:west><s:Inject/><p:Room>emptyRoom9</p:Room></p:west>
+ </p:GameRoom>
+
+ <p:GameRoom>
+ <s:SessionScoped/>
+ <p:roomType>MONSTER</p:roomType>
+ <p:adjacentMessage>You smell a Wumpus</p:adjacentMessage>
+ <p:shootMessage>You hear a 'Thud', followed by a roar of pain.</p:shootMessage>
+ <p:killedRoomMessage>You stumbe accross a dead Wumpus. Well that wasn't so hard...</p:killedRoomMessage>
+ <p:message>You find a Wumpus. It eats you.</p:message>
+ <p:shootEffect>KILL</p:shootEffect>
+ <p:Room>wumpusRoom</p:Room>
+ <p:south><s:Inject/><p:Room>emptyRoom9</p:Room></p:south>
+ </p:GameRoom>
+
+
</beans>
Deleted: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 21:24:24 UTC (rev 12160)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
- xmlns:p="org.jboss.seam.xml.examples.princess">
- <!-- Makes the Room annotation a qualifier -->
- <p:Room>
- <Qualifier/>
- </p:Room>
-
- <p:GameManager>
- <extends/>
- <p:allRooms>
- <Any/>
- <Inject/>
- </p:allRooms>
- <p:emptyRoomShootMessage>Your arrow does not appear to hit anything.</p:emptyRoomShootMessage>
- <p:startMessage>You enter the dungeon, with you bow in your hand and your heart in your mouth.</p:startMessage>
- <p:startRoom>
- <!-- Inject the starting room -->
- <Inject/>
- <p:Room>startRoom</p:Room>
- </p:startRoom>
- </p:GameManager>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room value="startRoom"/>
- <p:north><Inject/><p:Room>emptyRoom1</p:Room></p:north>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom1</p:Room>
- <p:north><Inject/><p:Room>emptyRoom3</p:Room></p:north>
- <p:west><Inject/><p:Room>dwarfRoom</p:Room></p:west>
- <p:east><Inject/><p:Room>pitRoom1</p:Room></p:east>
- <p:south><Inject/><p:Room>startRoom</p:Room></p:south>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>dwarfRoom</p:Room>
- <p:roomType>MONSTER</p:roomType>
- <p:shootEffect>KILL</p:shootEffect>
- <p:adjacentMessage>You hear drunken singing.</p:adjacentMessage>
- <p:message>You find a drunken dwarven miner. He belches in your direction, falls over, then seems to forget you are there.</p:message>
- <p:shootMessage>You hear a 'Thud', followed by a surprised yell.</p:shootMessage>
- <p:killedRoomMessage>You find a dead dwarven miner with something that looks suspiciously like one of your arrows sticking out of his chest. Probably best you don't mention this to anyone...</p:killedRoomMessage>
- <p:east><Inject/><p:Room>emptyRoom1</p:Room></p:east>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>pitRoom1</p:Room>
- <p:roomType>GAMEOVER</p:roomType>
- <p:adjacentMessage>You feel a breeze.</p:adjacentMessage>
- <p:message>You fall into a bottomless pit. Game Over. </p:message>
- <p:west><Inject/><p:Room>emptyRoom1</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom2</p:Room>
- <p:north><Inject/><p:Room>emptyRoom4</p:Room></p:north>
- <p:west><Inject/><p:Room>pitRoom1</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom3</p:Room>
- <p:north><Inject/><p:Room>pitRoom2</p:Room></p:north>
- <p:east><Inject/><p:Room>batRoom</p:Room></p:east>
- <p:south><Inject/><p:Room>emptyRoom1</p:Room></p:south>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>batRoom</p:Room>
- <p:adjacentMessage>You hear a screeching noise.</p:adjacentMessage>
- <p:message>A swarm of bats lands on you and tries to pick you up. They fail miserably. You swat them away with your bow.</p:message>
- <p:shootMessage>You seem to have disturbed some bats, they fly past your head in the dark.</p:shootMessage>
- <p:north><Inject/><p:Room>emptyRoom6</p:Room></p:north>
- <p:east><Inject/><p:Room>emptyRoom4</p:Room></p:east>
- <p:south><Inject/><p:Room>pitRoom1</p:Room></p:south>
- <p:west><Inject/><p:Room>emptyRoom3</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom4</p:Room>
- <p:east><Inject/><p:Room>emptyRoom5</p:Room></p:east>
- <p:south><Inject/><p:Room>emptyRoom2</p:Room></p:south>
- <p:west><Inject/><p:Room>batRoom</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom5</p:Room>
- <p:north><Inject/><p:Room>emptyRoom7</p:Room></p:north>
- <p:east><Inject/><p:Room>dragonRoom</p:Room></p:east>
- <p:west><Inject/><p:Room>emptyRoom4</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>dragonRoom</p:Room>
- <p:adjacentMessage>You hear a snoring noise. With every snore you see a flickering light, as if something were breathing flames from its nostrils.</p:adjacentMessage>
- <p:roomType>GAMEOVER</p:roomType>
- <p:message>The dragon wakes up as you enter. Then it eats you.</p:message>
- <p:shootEffect>ANNOY</p:shootEffect>
- <p:shootMessage>Your arrow wakes up the dragon, without appearing to do any real damage. The last moments of your life are spent running from an angry dragon.</p:shootMessage>
- <p:north><Inject/><p:Room>princessRoom</p:Room></p:north>
- <p:west><Inject/><p:Room>emptyRoom5</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>pitRoom2</p:Room>
- <p:roomType>GAMEOVER</p:roomType>
- <p:adjacentMessage>You feel a breeze.</p:adjacentMessage>
- <p:message>You fall into a bottomless pit. Game Over. </p:message>
- <p:south><Inject/><p:Room>emptyRoom3</p:Room></p:south>
- <p:east><Inject/><p:Room>emptyRoom6</p:Room></p:east>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom6</p:Room>
- <p:north><Inject/><p:Room>emptyRoom8</p:Room></p:north>
- <p:west><Inject/><p:Room>pitRoom2</p:Room></p:west>
- <p:south><Inject/><p:Room>batRoom</p:Room></p:south>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom7</p:Room>
- <p:north><Inject/><p:Room>emptyRoom10</p:Room></p:north>
- <p:east><Inject/><p:Room>princessRoom</p:Room></p:east>
- <p:south><Inject/><p:Room>emptyRoom5</p:Room></p:south>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>princessRoom</p:Room>
- <p:adjacentMessage>You hear a sobbing noise.</p:adjacentMessage>
- <p:roomType>GAMEOVER</p:roomType>
- <p:message>You find the princess and quickly free her, and then escape from the dungeon. You both live happily ever after.</p:message>
- <p:shootEffect>ANNOY</p:shootEffect>
- <p:shootMessage>Your arrow clatters against the wall. You hear a cry 'Help i'm being shot at'. The cry wakes the dragon in the room next door, which promptly eats you.</p:shootMessage>
- <p:south><Inject/><p:Room>dragonRoom</p:Room></p:south>
- <p:west><Inject/><p:Room>emptyRoom7</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom8</p:Room>
- <p:east><Inject/><p:Room>emptyRoom9</p:Room></p:east>
- <p:south><Inject/><p:Room>emptyRoom6</p:Room></p:south>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom9</p:Room>
- <p:north><Inject/><p:Room>wumpusRoom</p:Room></p:north>
- <p:east><Inject/><p:Room>emptyRoom10</p:Room></p:east>
- <p:west><Inject/><p:Room>emptyRoom8</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:Room>emptyRoom10</p:Room>
- <p:south><Inject/><p:Room>emptyRoom7</p:Room></p:south>
- <p:west><Inject/><p:Room>emptyRoom9</p:Room></p:west>
- </p:GameRoom>
-
- <p:GameRoom>
- <SessionScoped/>
- <p:roomType>MONSTER</p:roomType>
- <p:adjacentMessage>You smell a Wumpus</p:adjacentMessage>
- <p:shootMessage>You hear a 'Thud', followed by a roar of pain.</p:shootMessage>
- <p:killedRoomMessage>You stumbe accross a dead Wumpus. Well that wasn't so hard...</p:killedRoomMessage>
- <p:message>You find a Wumpus. It eats you.</p:message>
- <p:shootEffect>KILL</p:shootEffect>
- <p:Room>wumpusRoom</p:Room>
- <p:south><Inject/><p:Room>emptyRoom9</p:Room></p:south>
- </p:GameRoom>
-
-</beans>
\ No newline at end of file
14 years, 1 month
Seam SVN: r12159 - in modules/xml/trunk: core/src/test/resources/META-INF and 10 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-10 16:20:30 -0500 (Wed, 10 Mar 2010)
New Revision: 12159
Modified:
modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/core/src/test/resources/META-INF/beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml
modules/xml/trunk/docs/en-US/xml-general.xml
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml
Log:
changed root namspace to urn:java:seam:core
Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-10 21:20:30 UTC (rev 12159)
@@ -44,7 +44,7 @@
AnnotationInstanceProvider ac = new AnnotationInstanceProvider();
- static final String ROOT_NAMESPACE = "urn:seam:core";
+ static final String ROOT_NAMESPACE = "urn:java:seam:core";
static final String BEANS_ROOT_NAMESPACE = "http://java.sun.com/xml/ns/javaee";
@@ -63,7 +63,7 @@
}
if (!(ROOT_NAMESPACE.equals(root.getNamespaceUri()) || BEANS_ROOT_NAMESPACE.equals(root.getNamespaceUri())))
{
- throw new XmlConfigurationException("Wrong root namespace for XML config file, expected:" + ROOT_NAMESPACE + " or " + BEANS_ROOT_NAMESPACE +" found:" + root.getNamespaceUri(), root.getDocument(), root.getLineNo());
+ throw new XmlConfigurationException("Wrong root namespace for XML config file, expected:" + ROOT_NAMESPACE + " or " + BEANS_ROOT_NAMESPACE + " found:" + root.getNamespaceUri(), root.getDocument(), root.getLineNo());
}
resolvers.put(ROOT_NAMESPACE, new RootNamespaceElementResolver());
@@ -76,10 +76,10 @@
// nodes with a null namespace are whitespace nodes etc
if (node.getNamespaceUri() != null)
{
- if(node.getNamespaceUri().equals(BEANS_ROOT_NAMESPACE))
- {
- continue;
- }
+ if (node.getNamespaceUri().equals(BEANS_ROOT_NAMESPACE))
+ {
+ continue;
+ }
XmlItem rb = resolveNode(node, null);
// validateXmlItem(rb);
addNodeToResult(ret, rb);
Modified: modules/xml/trunk/core/src/test/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,6 +1,6 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:seam:core"
+ xmlns:s="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.constructor">
<test:ValueProvider>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:ArrayFieldValue>
<override/>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:CollectionFieldValue>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:MapFieldValue>
<override/>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:FieldValueBean>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
<test:OtherQualifier>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
<test:InterceptedBean>
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
+<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.method">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.producer">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml
===================================================================
--- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.stereotype"
xmlns:int="urn:java:org.jboss.seam.xml.test.interceptor">
Modified: modules/xml/trunk/docs/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -31,7 +31,7 @@
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
<test:ProducerQualifier>
@@ -59,7 +59,7 @@
<para>From the top:</para>
- <para>The root element of the file has to be <literal><Beans/></literal>, and the root namespace should be <literal>urn:seam:core</literal>.
+ <para>The root element of the file has to be <literal><Beans/></literal>, and the root namespace should be <literal>urn:java:seam:core</literal>.
You will also notice that there is a second namespace defined, <literal>urn:java:org.jboss.seam.xml.test.injection</literal>, this namespace is used
to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>.</para>
<programlisting>
@@ -240,7 +240,7 @@
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.method">
<test:MethodBean>
<test:method>
Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 15:52:17 UTC (rev 12158)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 21:20:30 UTC (rev 12159)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:seam:core"
+<beans xmlns="urn:java:seam:core"
xmlns:p="org.jboss.seam.xml.examples.princess">
<!-- Makes the Room annotation a qualifier -->
<p:Room>
14 years, 1 month
Seam SVN: r12158 - branches/community/Seam_2_2/examples/drools/resources.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-03-10 10:52:17 -0500 (Wed, 10 Mar 2010)
New Revision: 12158
Modified:
branches/community/Seam_2_2/examples/drools/resources/numberguess.drl
Log:
JBSEAM-4562
Modified: branches/community/Seam_2_2/examples/drools/resources/numberguess.drl
===================================================================
--- branches/community/Seam_2_2/examples/drools/resources/numberguess.drl 2010-03-10 14:02:38 UTC (rev 12157)
+++ branches/community/Seam_2_2/examples/drools/resources/numberguess.drl 2010-03-10 15:52:17 UTC (rev 12158)
@@ -34,9 +34,9 @@
rule Lose
#ruleflow-group "Decision"
when
- Game(guessCount==9)
+ Guess(value!=randomNumber)
then
- if ( decision.getOutcome()==null )
+ if ( game.getGuessCount() == 9 && decision.getOutcome()==null )
{
decision.setOutcome("lose");
}
14 years, 1 month
Seam SVN: r12157 - tags/JBoss_Seam_2_2_1_CR1/examples/seambay/src/org/jboss/seam/example/seambay.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-03-10 09:02:38 -0500 (Wed, 10 Mar 2010)
New Revision: 12157
Modified:
tags/JBoss_Seam_2_2_1_CR1/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
Log:
ported JBSEAM-4563
Modified: tags/JBoss_Seam_2_2_1_CR1/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 13:35:31 UTC (rev 12156)
+++ tags/JBoss_Seam_2_2_1_CR1/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 14:02:38 UTC (rev 12157)
@@ -6,7 +6,6 @@
import java.util.List;
import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
@@ -34,7 +33,7 @@
@Begin(join = true)
public void placeBid()
- {
+ {
if (auction.getStatus() != Auction.STATUS_LIVE ||
auction.getEndDate().getTime() < System.currentTimeMillis())
{
@@ -87,7 +86,6 @@
bid.setAuction(entityManager.find(Auction.class, bid.getAuction().getAuctionId()));
}
- entityManager.lock(bid.getAuction(), LockModeType.WRITE);
entityManager.refresh(bid.getAuction());
if (bid.getAuction().getStatus() != Auction.STATUS_LIVE)
@@ -175,7 +173,6 @@
bid.getAuction().setBids(bid.getAuction().getBids() + 1);
entityManager.persist(bid);
- entityManager.flush();
if ("success".equals(outcome))
{
14 years, 1 month
Seam SVN: r12156 - branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-03-10 08:35:31 -0500 (Wed, 10 Mar 2010)
New Revision: 12156
Modified:
branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
Log:
JBSEAM-4563 - removed import and lock
Modified: branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
===================================================================
--- branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 13:16:38 UTC (rev 12155)
+++ branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 13:35:31 UTC (rev 12156)
@@ -6,7 +6,6 @@
import java.util.List;
import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
@@ -87,7 +86,6 @@
bid.setAuction(entityManager.find(Auction.class, bid.getAuction().getAuctionId()));
}
- //entityManager.lock(bid.getAuction(), LockModeType.WRITE);
entityManager.refresh(bid.getAuction());
if (bid.getAuction().getStatus() != Auction.STATUS_LIVE)
14 years, 1 month
Seam SVN: r12155 - branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-10 08:16:38 -0500 (Wed, 10 Mar 2010)
New Revision: 12155
Modified:
branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
Log:
fix exception in as6m2
Modified: branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
===================================================================
--- branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 11:50:30 UTC (rev 12154)
+++ branches/community/Seam_2_2/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java 2010-03-10 13:16:38 UTC (rev 12155)
@@ -34,7 +34,7 @@
@Begin(join = true)
public void placeBid()
- {
+ {
if (auction.getStatus() != Auction.STATUS_LIVE ||
auction.getEndDate().getTime() < System.currentTimeMillis())
{
@@ -87,7 +87,7 @@
bid.setAuction(entityManager.find(Auction.class, bid.getAuction().getAuctionId()));
}
- entityManager.lock(bid.getAuction(), LockModeType.WRITE);
+ //entityManager.lock(bid.getAuction(), LockModeType.WRITE);
entityManager.refresh(bid.getAuction());
if (bid.getAuction().getStatus() != Auction.STATUS_LIVE)
@@ -175,7 +175,6 @@
bid.getAuction().setBids(bid.getAuction().getBids() + 1);
entityManager.persist(bid);
- entityManager.flush();
if ("success".equals(outcome))
{
14 years, 1 month