Seam SVN: r13134 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-06-14 06:14:23 -0400 (Mon, 14 Jun 2010)
New Revision: 13134
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockServletContext.java
Log:
JBPAPP-4273 - getting real webappRoot from container
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockServletContext.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockServletContext.java 2010-06-13 22:06:15 UTC (rev 13133)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockServletContext.java 2010-06-14 10:14:23 UTC (rev 13134)
@@ -56,7 +56,11 @@
}
else
{
- webappRoot = new File(getClass().getResource("/.").toURI());
+ // in case of web application in real servlet container
+ // expected path /jboss-as/server/<profile>/deploy/<war>/WEB-INF/lib/jboss-seam.jar/org/jboss/seam/mock/
+ String pathToPackage = getClass().getResource("").getPath();
+ String[] paths = pathToPackage.split("WEB-INF");
+ webappRoot = new File(paths[0]);
}
}
catch (URISyntaxException e)
14 years
- 1
- 0
Seam SVN: r13133 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-13 18:06:15 -0400 (Sun, 13 Jun 2010)
New Revision: 13133
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
Log:
remove commented code (we use a vcs with history!)
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-13 22:02:05 UTC (rev 13132)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-13 22:06:15 UTC (rev 13133)
@@ -30,7 +30,6 @@
public User getCurrentAccount()
{
log.info("Producing canned User");
- //return new User("Dan Allen", "dan");
return em.find(User.class, "dan");
}
}
14 years
- 1
- 0
Seam SVN: r13132 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-13 18:02:05 -0400 (Sun, 13 Jun 2010)
New Revision: 13132
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
Log:
remove commented code (we use a vcs with history!)
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-13 18:49:10 UTC (rev 13131)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-13 22:02:05 UTC (rev 13132)
@@ -2,8 +2,6 @@
import javax.ejb.Stateless;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import org.slf4j.Logger;
@@ -19,28 +17,10 @@
@Inject
private Logger log;
- @PersistenceContext
- private EntityManager em;
-
- // @Inject
- // private Credentials credentials;
-
public boolean authenticate()
{
- // if ((credentials.getUsername() != null) &&
- // (credentials.getUsername().length() > 0))
- // {
- // log.info("Authenticating {0}...", credentials.getUsername());
- // User user = em.find(User.class, credentials.getUsername());
- // if (user != null &&
- // user.getPassword().equals(credentials.getPassword()))
- // {
- // credentials.setPassword(null);
+ log.info("Logging you in!");
return true;
- // }
- // }
-
- // return false;
}
}
14 years
- 1
- 0
Seam SVN: r13131 - in examples/trunk: booking-simplified and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-13 14:49:10 -0400 (Sun, 13 Jun 2010)
New Revision: 13131
Modified:
examples/trunk/booking-simplified/pom.xml
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java
examples/trunk/pom.xml
Log:
refactor onto Seam build systems
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-13 16:43:09 UTC (rev 13130)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-13 18:49:10 UTC (rev 13131)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.jboss.weld.examples</groupId>
- <artifactId>weld-examples-parent</artifactId>
- <version>1.0.1-Final</version>
+ <groupId>org.jboss.seam.examples</groupId>
+ <artifactId>seam-examples-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.seam.examples</groupId>
@@ -27,7 +28,8 @@
<webapp.directory>src/main/webapp</webapp.directory>
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
- <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
+ <seam.faces.version>3.0.0-SNAPSHOT</seam.faces.version>
+ <jpamodelgen.version>1.0.0.Final</jpamodelgen.version>
</properties>
<dependencies>
@@ -35,20 +37,20 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
- <version>1.0.0.Final</version>
+ <!-- TODO Get this into Weld Parent! -->
+ <version>${jpamodelgen.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
- <version>3.0.0.Alpha3</version>
+ <version>${seam.faces.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam.xml</groupId>
<artifactId>seam-xml-config</artifactId>
- <version>3.0.0.Alpha2</version>
<exclusions>
<exclusion>
<groupId>javax.enterprise</groupId>
@@ -60,31 +62,32 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
</dependency>
<!--
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.10</version>
- </dependency>
+ <dependency> <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId> <version>1.5.10</version>
+ </dependency>
-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -141,8 +144,8 @@
<wtpdefaultserver>JBossAS</wtpdefaultserver>
<wtpversion>2.0</wtpversion>
<!--
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
-->
</configuration>
</plugin>
Modified: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java 2010-06-13 16:43:09 UTC (rev 13130)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java 2010-06-13 18:49:10 UTC (rev 13131)
@@ -3,21 +3,23 @@
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.transaction.UserTransaction;
+
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.examples.booking.account.Registered;
import org.jboss.seam.examples.booking.controls.BookingFormControls;
import org.jboss.seam.examples.booking.model.Booking;
import org.jboss.seam.examples.booking.model.CreditCardType;
-import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
import org.jboss.seam.examples.booking.model.Hotel;
import org.jboss.seam.examples.booking.model.User;
+import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
import org.jboss.seam.examples.booking.support.NoOpLogger;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -72,7 +74,7 @@
public void testBookHotel() throws Exception
{
prepareSeedData();
- ConversationContext cc = Container.instance().deploymentServices().get(ContextLifecycle.class).getConversationContext();
+ ConversationContext cc = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
cc.setBeanStore(new HashMapBeanStore());
cc.setActive(true);
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2010-06-13 16:43:09 UTC (rev 13130)
+++ examples/trunk/pom.xml 2010-06-13 18:49:10 UTC (rev 13131)
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
<groupId>org.jboss.seam</groupId>
- <artifactId>seam-version-matrix</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>seam-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.jboss.seam.examples</groupId>
@@ -19,9 +18,13 @@
<description>
Examples for the Seam Framework
</description>
-
+
<url>http://www.seamframework.org</url>
+ <properties>
+ <seam.version>3.0.0.b01</seam.version>
+ </properties>
+
<developers>
<developer>
<name>Pete Muir</name>
@@ -68,14 +71,27 @@
<url>http://in.relation.to/Bloggers/Dan</url>
<organization>JBoss, a division of Red Hat</organization>
</developer>
-
+
<!-- TODO continue adding core developers -->
-
+
</developers>
-
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam</artifactId>
+ <version>${seam.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>booking</module>
<module>servlet-booking</module>
+ <module>booking-simplified</module>
<!--<module>servlet-permalink</module>-->
</modules>
@@ -86,15 +102,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<classpathContainers>
@@ -105,33 +112,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <metadataFile>../target/coverage.em</metadataFile>
- <outputDirectory>${project.build.directory}/generated-classes</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<ejbVersion>3.0</ejbVersion>
@@ -157,21 +137,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/seam/examples/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
</plugins>
</build>
@@ -181,7 +146,7 @@
<profile>
<id>jdk5</id>
<activation>
- <jdk>1.5</jdk>
+ <jdk>1.5</jdk>
</activation>
<dependencies>
<dependency>
@@ -194,28 +159,6 @@
</profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- <!--
- <instrumentation>
- <ignores>
- <ignore>org.jboss.seam.*</ignore>
- </ignores>
- </instrumentation>
- -->
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<ciManagement>
<system>Hudson</system>
<url />
@@ -223,7 +166,7 @@
<issueManagement>
<system>JIRA</system>
- <url>http://jira.jboss.org/browse/JBSEAM</url>
+ <url>http://jira.jboss.org/browse/SEAM</url>
</issueManagement>
<inceptionYear>2005</inceptionYear>
@@ -241,19 +184,4 @@
<url>http://fisheye.jboss.org/browse/Seam/examples</url>
</scm>
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
14 years
- 1
- 0
Seam SVN: r13130 - build/trunk.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-13 12:43:09 -0400 (Sun, 13 Jun 2010)
New Revision: 13130
Modified:
build/trunk/checkout.sh
Log:
add examples to checkout script
Modified: build/trunk/checkout.sh
===================================================================
--- build/trunk/checkout.sh 2010-06-12 00:10:24 UTC (rev 13129)
+++ build/trunk/checkout.sh 2010-06-13 16:43:09 UTC (rev 13130)
@@ -66,6 +66,19 @@
fi
$svncmd
+url="$SVNBASE/examples/trunk"
+moduledir=$DESTINATION/examples
+if [ -d $moduledir ]
+then
+ echo "Updating examples"
+ svncmd="svn up $SVNARGS $DESTINATION/examples"
+else
+ echo "Checking out examples"
+ svncmd="svn co $SVNARGS $url $DESTINATION/examples"
+fi
+$svncmd
+
+
url="$SVNBASE/build/trunk"
moduledir=$DESTINATION/build
if [ -d $moduledir ]
14 years
- 1
- 0
Seam SVN: r13129 - in examples/trunk/booking-simplified: src/main/java/org/jboss/seam/examples/booking/account and 5 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-11 20:10:24 -0400 (Fri, 11 Jun 2010)
New Revision: 13129
Added:
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java
Removed:
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java
Modified:
examples/trunk/booking-simplified/
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking.java
Log:
add test for booking
fix up booking
Property changes on: examples/trunk/booking-simplified
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
faces-config.NavData
+ target
.settings
.classpath
.project
faces-config.NavData
nbactions*
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-12 00:09:08 UTC (rev 13128)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -30,6 +30,7 @@
public User getCurrentAccount()
{
log.info("Producing canned User");
- return new User("Dan Allen", "dan");
+ //return new User("Dan Allen", "dan");
+ return em.find(User.class, "dan");
}
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-12 00:09:08 UTC (rev 13128)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -48,6 +48,4 @@
Booking getBooking();
boolean isBookingValid();
-
- void destroy();
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-12 00:09:08 UTC (rev 13128)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -27,7 +27,6 @@
import java.util.Calendar;
-import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
@@ -87,6 +86,7 @@
private boolean bookingValid;
+ //@Begin
public void selectHotel(final Hotel hotel)
{
// NOTE get a fresh reference that's managed by the conversational
@@ -128,6 +128,7 @@
}
}
+ //@End
public void confirm()
{
em.persist(booking);
@@ -141,6 +142,7 @@
conversation.end();
}
+ //@End
public void cancel()
{
booking = null;
@@ -168,9 +170,4 @@
{
return bookingValid;
}
-
- @Remove
- public void destroy()
- {
- }
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking.java 2010-06-12 00:09:08 UTC (rev 13128)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -29,6 +29,7 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.util.Date;
+import javax.enterprise.inject.Typed;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -52,6 +53,7 @@
* @author Dan Allen
*/
@Entity
+@Typed()
public class Booking implements Serializable
{
private Long id;
@@ -76,6 +78,8 @@
this.hotel = hotel;
this.user = user;
this.creditCardName = user.getName();
+ this.smoking = false;
+ this.beds = 1;
}
@Id
Added: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java (rev 0)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/booking/BookingAgentTest.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -0,0 +1,112 @@
+package org.jboss.seam.examples.booking.booking;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.examples.booking.account.Registered;
+import org.jboss.seam.examples.booking.controls.BookingFormControls;
+import org.jboss.seam.examples.booking.model.Booking;
+import org.jboss.seam.examples.booking.model.CreditCardType;
+import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
+import org.jboss.seam.examples.booking.model.Hotel;
+import org.jboss.seam.examples.booking.model.User;
+import org.jboss.seam.examples.booking.support.NoOpLogger;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.ConversationContext;
+import org.jboss.weld.context.api.ContextualInstance;
+import org.jboss.weld.context.api.helpers.AbstractMapBackedBeanStore;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class BookingAgentTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive() {
+ WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ .addPackage(Hotel.class.getPackage())
+ .addClasses(BookingAgent.class, BookingAgentBean.class, Confirmed.class,
+ Registered.class, BookingEvent.class, BookingFormControls.class, NoOpLogger.class)
+ .addLibraries(
+ MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international-api:3.0.0.Alpha1"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.Alpha1")
+ )
+ .addWebResource("META-INF/persistence.xml", "classes/META-INF/persistence.xml")
+ .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return war;
+ }
+
+ @Inject UserTransaction utx;
+ @PersistenceContext EntityManager em;
+ @Inject BookingAgent bookingAgent;
+ @Inject Instance<Booking> bookingInstance;
+
+ public void prepareSeedData() throws Exception
+ {
+ utx.begin();
+ em.joinTransaction();
+ em.createQuery("delete from Booking").executeUpdate();
+ em.createQuery("delete from Hotel").executeUpdate();
+ em.persist(new Hotel("Doubletree Atlanta-Buckhead", "3342 Peachtree Road NE", "Atlanta", "GA", "30326", "USA"));
+ em.createQuery("delete from User").executeUpdate();
+ em.persist(new User("Ike", "ike", "incontainer"));
+ utx.commit();
+ }
+
+ @Test
+ public void testBookHotel() throws Exception
+ {
+ prepareSeedData();
+ ConversationContext cc = Container.instance().deploymentServices().get(ContextLifecycle.class).getConversationContext();
+ cc.setBeanStore(new HashMapBeanStore());
+ cc.setActive(true);
+
+ bookingAgent.selectHotel(em.find(Hotel.class, 1l));
+ bookingAgent.bookHotel();
+ Booking booking = bookingInstance.get();
+ booking.setCreditCardNumber("1111222233334444");
+ booking.setCreditCardExpiryMonth(1);
+ booking.setCreditCardExpiryYear(2012);
+ booking.setCreditCardType(CreditCardType.VISA);
+ booking.setBeds(1);
+ booking.setSmoking(false);
+ bookingAgent.confirm();
+
+ Assert.assertEquals(1, em.createQuery("select b from Booking b").getResultList().size());
+ }
+
+ @Produces @Registered User getRegisteredUser()
+ {
+ return em.find(User.class, "ike");
+ }
+
+ public static class HashMapBeanStore extends AbstractMapBackedBeanStore implements Serializable
+ {
+ protected Map<String, ContextualInstance<? extends Object>> delegate;
+ public HashMapBeanStore()
+ {
+ delegate = new HashMap<String, ContextualInstance<? extends Object>>();
+ }
+
+ @Override
+ protected Map<String, ContextualInstance<? extends Object>> delegate() {
+ return delegate;
+ }
+ }
+
+}
Copied: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java (from rev 13127, examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java)
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java (rev 0)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTest.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -0,0 +1,82 @@
+package org.jboss.seam.examples.booking.inventory;
+
+import java.util.List;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
+import org.jboss.seam.examples.booking.model.Hotel;
+import org.jboss.seam.examples.booking.support.NoOpLogger;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class HotelSearchTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive() {
+ // JavaArchive doesn't work on GlassFish (would work on JBoss AS, but it breaks because of the EJBs)
+// JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class)
+// .addPackage(HotelSearch.class.getPackage())
+// .addPackage(Hotel.class.getPackage())
+// .addManifestResource("META-INF/persistence.xml", "persistence.xml")
+// .addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+// return jar;
+ // WebArchive does work in all cases (except JBoss AS still breaks with EJBs)
+ WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ .addPackage(HotelSearch.class.getPackage())
+ .addPackage(Hotel.class.getPackage())
+ .addClasses(NoOpLogger.class)
+ .addLibraries(
+ MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international-api:3.0.0.Alpha1"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.Alpha1")
+ )
+ .addWebResource("META-INF/persistence.xml", "classes/META-INF/persistence.xml")
+ .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return war;
+ }
+
+ @Inject UserTransaction utx;
+ @PersistenceContext EntityManager em;
+ @Inject SearchCriteria criteria;
+ @Inject HotelSearch hotelSearch;
+ @Inject Instance<List<Hotel>> hotelsInstance;
+
+ public void prepareSeedData() throws Exception
+ {
+ utx.begin();
+ em.joinTransaction();
+ em.createQuery("delete from Hotel").executeUpdate();
+ em.persist(new Hotel("Doubletree Atlanta-Buckhead", "3342 Peachtree Road NE", "Atlanta", "GA", "30326", "USA"));
+ utx.commit();
+ }
+
+ @Test
+ public void testSearch() throws Exception
+ {
+ prepareSeedData();
+
+ criteria.setQuery("atlanta");
+ hotelSearch.find();
+ List<Hotel> hotels = hotelsInstance.get();
+ Assert.assertEquals(1, hotels.size());
+ Assert.assertEquals(hotels.get(0).getName(), "Doubletree Atlanta-Buckhead");
+
+ criteria.setQuery("boston");
+ hotelSearch.find();
+ hotels = hotelsInstance.get();
+ Assert.assertEquals(0, hotels.size());
+ }
+
+}
Deleted: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java 2010-06-12 00:09:08 UTC (rev 13128)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java 2010-06-12 00:10:24 UTC (rev 13129)
@@ -1,82 +0,0 @@
-package org.jboss.seam.examples.booking.inventory;
-
-import java.util.List;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.UserTransaction;
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
-import org.jboss.seam.examples.booking.model.Hotel;
-import org.jboss.seam.examples.booking.support.NoOpLogger;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-(a)RunWith(Arquillian.class)
-public class HotelSearchTestCase
-{
- @Deployment
- public static Archive<?> createTestArchive() {
- // JavaArchive doesn't work on GlassFish (would work on JBoss AS, but it breaks because of the EJBs)
-// JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class)
-// .addPackage(HotelSearch.class.getPackage())
-// .addPackage(Hotel.class.getPackage())
-// .addManifestResource("META-INF/persistence.xml", "persistence.xml")
-// .addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
-// return jar;
- // WebArchive does work in all cases (except JBoss AS still breaks with EJBs)
- WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
- .addPackage(HotelSearch.class.getPackage())
- .addPackage(Hotel.class.getPackage())
- .addClasses(NoOpLogger.class)
- .addLibraries(
- MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
- MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international-api:3.0.0.Alpha1"),
- MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.Alpha1")
- )
- .addWebResource("META-INF/persistence.xml", "classes/META-INF/persistence.xml")
- .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
- return war;
- }
-
- @Inject UserTransaction utx;
- @PersistenceContext EntityManager em;
- @Inject SearchCriteria criteria;
- @Inject HotelSearch hotelSearch;
- @Inject Instance<List<Hotel>> hotelsInstance;
-
- public void prepareSeedData() throws Exception
- {
- utx.begin();
- em.joinTransaction();
- em.createQuery("delete from Hotel").executeUpdate();
- em.persist(new Hotel("Doubletree Atlanta-Buckhead", "3342 Peachtree Road NE", "Atlanta", "GA", "30326", "USA"));
- utx.commit();
- }
-
- @Test
- public void testSearch() throws Exception
- {
- prepareSeedData();
-
- criteria.setQuery("atlanta");
- hotelSearch.find();
- List<Hotel> hotels = hotelsInstance.get();
- Assert.assertEquals(1, hotels.size());
- Assert.assertEquals(hotels.get(0).getName(), "Doubletree Atlanta-Buckhead");
-
- criteria.setQuery("boston");
- hotelSearch.find();
- hotels = hotelsInstance.get();
- Assert.assertEquals(0, hotels.size());
- }
-
-}
14 years
- 1
- 0
Seam SVN: r13128 - examples/trunk/booking-simplified/src/main/webapp.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-11 20:09:08 -0400 (Fri, 11 Jun 2010)
New Revision: 13128
Modified:
examples/trunk/booking-simplified/src/main/webapp/search.xhtml
Log:
remove security check
Modified: examples/trunk/booking-simplified/src/main/webapp/search.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-11 22:48:12 UTC (rev 13127)
+++ examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-12 00:09:08 UTC (rev 13128)
@@ -113,12 +113,12 @@
<h1>Current Hotel Bookings</h1>
</div>
<div class="section">
- <h:panelGroup rendered="#{not identity.loggedIn}">
+ <h:panelGroup rendered="#{false}">
You must be logged in to see the list of your hotel bookings.
</h:panelGroup>
- <h:form id="bookings" rendered="#{identity.loggedIn}">
- <h:outputText value="No bookings found." rendered="#{bookings.size == 0}"/>
- <h:dataTable id="bookings" value="#{bookings}" var="_booking" rendered="#{bookings.size gt 0}">
+ <h:form id="bookings" rendered="#{true}">
+ <h:outputText value="No bookings found." rendered="#{bookings.size() == 0}"/>
+ <h:dataTable id="bookings" value="#{bookings}" var="_booking" rendered="#{bookings.size() gt 0}">
<h:column id="nameCol">
<f:facet id="nameFct" name="header">Hotel name</f:facet>
#{_booking.hotel.name}
14 years
- 1
- 0
Seam SVN: r13127 - in examples/trunk/booking-simplified: src and 16 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-11 18:48:12 -0400 (Fri, 11 Jun 2010)
New Revision: 13127
Added:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking_.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel_.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/User_.java
examples/trunk/booking-simplified/src/test/
examples/trunk/booking-simplified/src/test/java/
examples/trunk/booking-simplified/src/test/java/org/
examples/trunk/booking-simplified/src/test/java/org/jboss/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/MavenArtifactResolver.java
examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/NoOpLogger.java
examples/trunk/booking-simplified/src/test/resources-glassfish/
examples/trunk/booking-simplified/src/test/resources-glassfish/sun-resources.xml
examples/trunk/booking-simplified/src/test/resources-jbossas/
examples/trunk/booking-simplified/src/test/resources-jbossas/jndi.properties
examples/trunk/booking-simplified/src/test/resources/
examples/trunk/booking-simplified/src/test/resources/arquillian.xml
Modified:
examples/trunk/booking-simplified/pom.xml
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearch.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/SearchCriteria.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel.java
examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/
Log:
add Arquillian infrastructure
add test for hotel search
add JPA 2 metamodel classes
use criteria query for hotel search
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-11 22:48:12 UTC (rev 13127)
@@ -14,7 +14,7 @@
<packaging>war</packaging>
<name>Seam Booking Example (Simplified packaging)</name>
<description>The Seam booking example packaged using the simplified Java EE packaging</description>
- <url>http://www.seamframework.org/Seam3</url>
+ <url>http://seamframework.org/Seam3</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -24,23 +24,18 @@
</licenses>
<properties>
- <jetty.http.port>9090</jetty.http.port>
- <jetty.stop.port>9091</jetty.stop.port>
- <jetty.debug.port>9190</jetty.debug.port>
- <jetty.daemon>false</jetty.daemon>
- <tomcat.http.port>6060</tomcat.http.port>
- <embedded-tomcat.http.port>9090</embedded-tomcat.http.port>
- <embedded-tomcat.debug.port>9190</embedded-tomcat.debug.port>
<webapp.directory>src/main/webapp</webapp.directory>
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
+ <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Beta4</version>
- <type>pom</type>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <version>1.0.0.Final</version>
<scope>provided</scope>
</dependency>
@@ -67,19 +62,29 @@
<artifactId>slf4j-api</artifactId>
<version>1.5.10</version>
</dependency>
+
+ <!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.10</version>
</dependency>
+ -->
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
<scope>test</scope>
- <classifier>jdk15</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -88,21 +93,13 @@
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <failOnError>false</failOnError>
- <filesets>
- <fileset>
- <!-- clean up files from war:inplace -->
- <directory>${webapp.directory}</directory>
- <includes>
- <include>META-INF/**</include>
- <include>WEB-INF/classes/**</include>
- <include>WEB-INF/lib/**</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
+ <source>1.6</source>
+ <target>1.6</target>
+ <!-- don't waste time on generation -->
+ <compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
@@ -134,58 +131,46 @@
</file>
</additionalConfig>
<additionalProjectFacets>
- <jst.jsf>1.2</jst.jsf> <!-- 2.0 is not yet supported -->
+ <jst.jsf>2.0</jst.jsf>
</additionalProjectFacets>
<additionalProjectnatures>
<projectnature>org.eclipse.wst.jsdt.core.jsNature</projectnature>
<projectnature>org.jboss.tools.jsf.jsfnature</projectnature>
</additionalProjectnatures>
<workspace>${user.home}/.eclipse/workspace</workspace>
- <wtpdefaultserver>JBoss</wtpdefaultserver>
- <wtpversion>1.5</wtpversion>
+ <wtpdefaultserver>JBossAS</wtpdefaultserver>
+ <wtpversion>2.0</wtpversion>
+ <!--
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ -->
</configuration>
</plugin>
+ <!-- Configure the JBoss AS Maven deploy plugin -->
<plugin>
- <artifactId>maven-war-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
<configuration>
- <!--
- don't stage or package files added to
- ${webapp.directory} by war:inplace
- -->
- <warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+ <fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
+ </fileNames>
</configuration>
</plugin>
+ <!-- Configure the Embedded GlassFish Maven plugin -->
<plugin>
- <groupId>org.twdata.maven</groupId>
- <artifactId>maven-cli-plugin</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ <version>3.0</version>
<configuration>
- <prompt>${project.artifactId}</prompt>
- <!-- userAliases are for cli:execute-phase -->
- <userAliases>
- <runjetty>compile
- org.mortbay.jetty:maven-jetty-plugin:run -Pjetty</runjetty>
- <stopjetty>org.mortbay.jetty:maven-jetty-plugin:stop
- -Pjetty</stopjetty>
- <runtomcat>compile
- org.apache.maven.plugins:maven-war-plugin:inplace
- org.codehaus.mojo:tomcat-maven-plugin:run -Ptomcat</runtomcat>
- <explode>compile -o</explode>
- <!-- tomcat requires use of war:inplace -->
- <tcexplode>compile
- org.apache.maven.plugins:maven-war-plugin:inplace
- -Ptomcat -o</tcexplode>
- <restart>org.apache.maven.plugins:maven-antrun-plugin:run
- -Prestart-embedded</restart>
- <profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles
- -o</profiles>
- <pom>org.apache.maven.plugins:maven-help-plugin:effective-pom
- -o</pom>
- </userAliases>
- <!-- commands are for cli:execute -->
- <commands>
- </commands>
+ <app>${project.build.directory}/${project.build.finalName}.war</app>
+ <port>7070</port>
+ <containerType>web</containerType>
+ <instanceRoot>${project.build.directory}/gfembed${maven.build.timestamp}</instanceRoot>
+ <autoDelete>true</autoDelete>
</configuration>
</plugin>
@@ -194,363 +179,119 @@
<profiles>
<profile>
- <id>tomcat</id>
-
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<dependencies>
-
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>1.0.0.Beta4</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.0.0.GA</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/log/resources</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp-tomcat</directory>
- <filtering>false</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <path>/${project.build.finalName}</path>
- <!--
- uncomment to use server configuration override;
- see readme.txt for details
- -->
- <!--<server>tomcatserver</server>-->
- <url>http://localhost:${tomcat.http.port}/manager</url>
- <port>${embedded-tomcat.http.port}</port>
- <!--
- port for embedded Tomcat only (putting this
- configuration in the execution for the run goal
- doesn't work)
- -->
- <!--
- this isn't useful to us because we also need an
- web.xml override
- -->
- <!--
- <contextFile>src/main/webapp-tomcat/META-INF/context.xml</contextFile>
- -->
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
</profile>
<profile>
- <id>jetty</id>
-
+ <id>jbossas-remote-60</id>
<dependencies>
- <!-- (same dependencies as tomcat except for javax.servlet:jstl) -->
-
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jbossas-remote-60</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>1.0.0.Beta4</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
-
+ <!-- need for org.jnp.interfaces.NamingContextFactory -->
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>6.0.0.20100216-M2</version>
+ <type>pom</type>
+ <scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.0.0.GA</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
-
<build>
- <resources>
- <resource>
- <directory>src/log/resources</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${jetty.http.port}</port>
- <maxIdleTime>3600000</maxIdleTime>
- </connector>
- </connectors>
- <daemon>${jetty.daemon}</daemon>
- <stopPort>${jetty.stop.port}</stopPort>
- <stopKey>HASTA_LA_VISTA</stopKey>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <contextPath>/${project.build.finalName}</contextPath>
- <overrideWebXml>src/main/webapp-jetty/WEB-INF/override-web.xml</overrideWebXml>
- <jettyEnvXml>src/main/webapp-jetty/WEB-INF/jetty-env.xml</jettyEnvXml>
- </configuration>
- </plugin>
- </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-jbossas</directory>
+ </testResource>
+ </testResources>
</build>
-
</profile>
- <profile>
- <id>ftest-jboss-remote-51</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <ftest.artifact>ftest-permalink</ftest.artifact>
- <ftest.version>0.1${ftest.version.discriminator}</ftest.version>
- </properties>
-
+ <profile>
+ <id>glassfish-embedded-30</id>
<dependencies>
<dependency>
- <groupId>org.jboss.weld.examples.ftest</groupId>
- <artifactId>${ftest.artifact}</artifactId>
- <version>${ftest.version}</version>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-30</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>3.0.1-b02</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-glassfish</directory>
+ </testResource>
+ </testResources>
</build>
</profile>
- <profile>
- <id>ftest-jboss-remote-60</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <ftest.artifact>ftest-permalink</ftest.artifact>
- <ftest.version>0.1${ftest.version.discriminator}</ftest.version>
- </properties>
-
+ <profile>
+ <id>glassfish-remote-jsr88</id>
<dependencies>
<dependency>
- <groupId>org.jboss.weld.examples.ftest</groupId>
- <artifactId>${ftest.artifact}</artifactId>
- <version>${ftest.version}</version>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-remote-jsr88</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>3.0.1-b02</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-glassfish</directory>
+ </testResource>
+ </testResources>
</build>
</profile>
-
- <profile>
- <id>restart-embedded</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <tasks>
- <touch file="${webapp.directory}/WEB-INF/web.xml" />
- </tasks>
- </configuration>
- <!-- Hooking an execution to a phase is more correct, but slower -->
- <!--
- <executions> <execution> <id>touch-web-inf</id>
- <phase>validate</phase> <configuration> <tasks>
- <touch file="${webapp.directory}/WEB-INF/web.xml" /> </tasks> </configuration> <goals>
- <goal>run</goal> </goals> </execution>
- </executions>
- -->
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/examples/trunk/jsf/permalink</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/examples/trunk/jsf/permalink</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/examples/trunk/jsf/permalink</url>
- </scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/examples/trunk/booking-simpli...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/examples/trunk/booking-simplified</developerConnection>
+ <url>http://fisheye.jboss.org/browse/seam/examples/trunk/booking-simplified</url>
+ </scm>
</project>
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearch.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearch.java 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearch.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -30,17 +30,15 @@
@Local
public interface HotelSearch
{
- public void find();
+ void find();
- public void previousPage();
+ void previousPage();
- public void nextPage();
+ void nextPage();
- public List<Hotel> getHotels();
+ List<Hotel> getHotels();
- public boolean isNextPageAvailable();
+ boolean isNextPageAvailable();
- public boolean isPreviousPageAvailable();
-
- public void destroy();
+ boolean isPreviousPageAvailable();
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
@@ -34,9 +33,16 @@
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import org.jboss.seam.examples.booking.model.Hotel;
+import org.jboss.seam.examples.booking.model.Hotel_;
+import org.jboss.seam.international.status.MessageFactory;
import org.slf4j.Logger;
+//import org.jboss.seam.international.status.MessageFactory;
+//import org.slf4j.Logger;
@Named("hotelSearch")
@Stateful
@@ -49,6 +55,8 @@
@Inject private SearchCriteria criteria;
+ @Inject private MessageFactory mf;
+
private boolean nextPageAvailable = false;
private List<Hotel> hotels = new ArrayList<Hotel>();
@@ -90,27 +98,36 @@
return criteria.getPage() > 0;
}
- @Remove
- public void destroy()
- {
- }
-
private void queryHotels(SearchCriteria criteria)
{
- List<Hotel> results = em.createQuery(
- "select h from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern or lower(h.zip) like :pattern or lower(h.address) like :pattern").
- setParameter("pattern", criteria.getSearchPattern()).setMaxResults(criteria.getPageSize() + 1).setFirstResult(criteria.getPage() * criteria.getPageSize()).
- getResultList();
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<Hotel> cquery = builder.createQuery(Hotel.class);
+ Root<Hotel> hotel = cquery.from(Hotel.class);
+ // QUESTION can like create the pattern for us?
+ cquery.select(hotel)
+ .where(builder.or(
+ builder.like(builder.lower(hotel.get(Hotel_.name)), criteria.getSearchPattern()),
+ builder.like(builder.lower(hotel.get(Hotel_.city)), criteria.getSearchPattern()),
+ builder.like(builder.lower(hotel.get(Hotel_.zip)), criteria.getSearchPattern()),
+ builder.like(builder.lower(hotel.get(Hotel_.address)), criteria.getSearchPattern())
+ ));
+ List<Hotel> results = em.createQuery(cquery)
+ .setMaxResults(criteria.getFetchSize())
+ .setFirstResult(criteria.getFetchOffset())
+ .getResultList();
+
nextPageAvailable = results.size() > criteria.getPageSize();
if (nextPageAvailable)
{
+ // NOTE create new ArrayList since subList creates unserializable list
hotels = new ArrayList<Hotel>(results.subList(0, criteria.getPageSize()));
}
else
{
hotels = results;
}
- log.info("Found {0} hotel(s) matching search term ''{1}'' (limit {2})", new Object[] { hotels.size(), criteria.getQuery(), criteria.getPageSize()});
+ log.info(mf.info("Found {0} hotel(s) matching search term ''{1}'' (limit {2})")
+ .textParams(hotels.size(), criteria.getQuery(), criteria.getPageSize()).build().getText());
}
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/SearchCriteria.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/SearchCriteria.java 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/SearchCriteria.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -80,7 +80,17 @@
{
this.pageSize = pageSize;
}
+
+ public int getFetchSize()
+ {
+ return pageSize + 1;
+ }
+ public int getFetchOffset()
+ {
+ return page * pageSize;
+ }
+
public String getQuery()
{
return query;
Added: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking_.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking_.java (rev 0)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Booking_.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,24 @@
+package org.jboss.seam.examples.booking.model;
+
+import java.util.Date;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+(a)StaticMetamodel(Booking.class)
+public abstract class Booking_ {
+
+ public static volatile SingularAttribute<Booking, Long> id;
+ public static volatile SingularAttribute<Booking, Integer> beds;
+ public static volatile SingularAttribute<Booking, Boolean> smoking;
+ public static volatile SingularAttribute<Booking, String> creditCardName;
+ public static volatile SingularAttribute<Booking, String> creditCardNumber;
+ public static volatile SingularAttribute<Booking, Hotel> hotel;
+ public static volatile SingularAttribute<Booking, Date> checkinDate;
+ public static volatile SingularAttribute<Booking, Integer> creditCardExpiryYear;
+ public static volatile SingularAttribute<Booking, Integer> creditCardExpiryMonth;
+ public static volatile SingularAttribute<Booking, Date> checkoutDate;
+ public static volatile SingularAttribute<Booking, User> user;
+ public static volatile SingularAttribute<Booking, CreditCardType> creditCardType;
+
+}
+
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel.java 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -58,6 +58,18 @@
private Integer stars;
private BigDecimal price;
+ public Hotel() {}
+
+ public Hotel(String name, String address, String city, String state, String zip, String country)
+ {
+ this.name = name;
+ this.address = address;
+ this.city = city;
+ this.state = state;
+ this.zip = zip;
+ this.country = country;
+ }
+
@Id
@GeneratedValue
public Long getId()
Added: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel_.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel_.java (rev 0)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/Hotel_.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,21 @@
+package org.jboss.seam.examples.booking.model;
+
+import java.math.BigDecimal;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+(a)StaticMetamodel(Hotel.class)
+public abstract class Hotel_ {
+
+ public static volatile SingularAttribute<Hotel, Long> id;
+ public static volatile SingularAttribute<Hotel, String> zip;
+ public static volatile SingularAttribute<Hotel, BigDecimal> price;
+ public static volatile SingularAttribute<Hotel, String> address;
+ public static volatile SingularAttribute<Hotel, Integer> stars;
+ public static volatile SingularAttribute<Hotel, String> name;
+ public static volatile SingularAttribute<Hotel, String> state;
+ public static volatile SingularAttribute<Hotel, String> country;
+ public static volatile SingularAttribute<Hotel, String> city;
+
+}
+
Added: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/User_.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/User_.java (rev 0)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/model/User_.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,14 @@
+package org.jboss.seam.examples.booking.model;
+
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+(a)StaticMetamodel(User.class)
+public abstract class User_ {
+
+ public static volatile SingularAttribute<User, String> username;
+ public static volatile SingularAttribute<User, String> name;
+ public static volatile SingularAttribute<User, String> password;
+
+}
+
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-11 16:54:52 UTC (rev 13126)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-11 22:48:12 UTC (rev 13127)
@@ -5,13 +5,23 @@
version="1.0">
<persistence-unit name="booking">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <!--
+ -->
+ <jta-data-source>jdbc/__default</jta-data-source>
+ <!--
<jta-data-source>java:/DefaultDS</jta-data-source>
+ <jta-data-source>jdbc/__arquillian</jta-data-source>
+ -->
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
<!-- These are the default for JBoss EJB 3, but not for Hibernate EntityManager -->
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+
+ <!-- Properties for EclipseLink (default provider for GlassFish) -->
+ <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
+ <property name="eclipselink.logging.level" value="FINE"/>
</properties>
</persistence-unit>
</persistence>
Property changes on: examples/trunk/booking-simplified/src/main/webapp/WEB-INF
___________________________________________________________________
Name: svn:ignore
+ sun-web.xml
Added: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java (rev 0)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/inventory/HotelSearchTestCase.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,82 @@
+package org.jboss.seam.examples.booking.inventory;
+
+import java.util.List;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.examples.booking.support.MavenArtifactResolver;
+import org.jboss.seam.examples.booking.model.Hotel;
+import org.jboss.seam.examples.booking.support.NoOpLogger;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class HotelSearchTestCase
+{
+ @Deployment
+ public static Archive<?> createTestArchive() {
+ // JavaArchive doesn't work on GlassFish (would work on JBoss AS, but it breaks because of the EJBs)
+// JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class)
+// .addPackage(HotelSearch.class.getPackage())
+// .addPackage(Hotel.class.getPackage())
+// .addManifestResource("META-INF/persistence.xml", "persistence.xml")
+// .addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+// return jar;
+ // WebArchive does work in all cases (except JBoss AS still breaks with EJBs)
+ WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ .addPackage(HotelSearch.class.getPackage())
+ .addPackage(Hotel.class.getPackage())
+ .addClasses(NoOpLogger.class)
+ .addLibraries(
+ MavenArtifactResolver.resolve("joda-time:joda-time:1.6"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international-api:3.0.0.Alpha1"),
+ MavenArtifactResolver.resolve("org.jboss.seam.international:seam-international:3.0.0.Alpha1")
+ )
+ .addWebResource("META-INF/persistence.xml", "classes/META-INF/persistence.xml")
+ .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return war;
+ }
+
+ @Inject UserTransaction utx;
+ @PersistenceContext EntityManager em;
+ @Inject SearchCriteria criteria;
+ @Inject HotelSearch hotelSearch;
+ @Inject Instance<List<Hotel>> hotelsInstance;
+
+ public void prepareSeedData() throws Exception
+ {
+ utx.begin();
+ em.joinTransaction();
+ em.createQuery("delete from Hotel").executeUpdate();
+ em.persist(new Hotel("Doubletree Atlanta-Buckhead", "3342 Peachtree Road NE", "Atlanta", "GA", "30326", "USA"));
+ utx.commit();
+ }
+
+ @Test
+ public void testSearch() throws Exception
+ {
+ prepareSeedData();
+
+ criteria.setQuery("atlanta");
+ hotelSearch.find();
+ List<Hotel> hotels = hotelsInstance.get();
+ Assert.assertEquals(1, hotels.size());
+ Assert.assertEquals(hotels.get(0).getName(), "Doubletree Atlanta-Buckhead");
+
+ criteria.setQuery("boston");
+ hotelSearch.find();
+ hotels = hotelsInstance.get();
+ Assert.assertEquals(0, hotels.size());
+ }
+
+}
Added: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/MavenArtifactResolver.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/MavenArtifactResolver.java (rev 0)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/MavenArtifactResolver.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,25 @@
+package org.jboss.seam.examples.booking.support;
+
+import java.io.File;
+
+public class MavenArtifactResolver
+{
+ private static final String LOCAL_MAVEN_REPO =
+ System.getProperty("user.home") + File.separatorChar +
+ ".m2" + File.separatorChar + "repository";
+
+ public static File resolve(String groupId, String artifactId, String version)
+ {
+ return new File(LOCAL_MAVEN_REPO + File.separatorChar +
+ groupId.replace(".", File.separator) + File.separatorChar +
+ artifactId + File.separatorChar +
+ version + File.separatorChar +
+ artifactId + "-" + version + ".jar");
+ }
+
+ public static File resolve(String qualifiedArtifactId)
+ {
+ String[] segments = qualifiedArtifactId.split(":");
+ return resolve(segments[0], segments[1], segments[2]);
+ }
+}
Added: examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/NoOpLogger.java
===================================================================
--- examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/NoOpLogger.java (rev 0)
+++ examples/trunk/booking-simplified/src/test/java/org/jboss/seam/examples/booking/support/NoOpLogger.java 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,293 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.examples.booking.support;
+
+import java.io.Serializable;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+/**
+ * Provide a completely empty logger implementation for Unit Tests. This entire
+ * class is a no-op; it does <i>nothing</i>.
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a>
+ *
+ */
+public class NoOpLogger implements Logger, Serializable
+{
+
+ public void debug(final String arg0)
+ {
+ }
+
+ public void debug(final String arg0, final Object arg1)
+ {
+ }
+
+ public void debug(final String arg0, final Object[] arg1)
+ {
+ }
+
+ public void debug(final String arg0, final Throwable arg1)
+ {
+ }
+
+ public void debug(final Marker arg0, final String arg1)
+ {
+ }
+
+ public void debug(final String arg0, final Object arg1, final Object arg2)
+ {
+ }
+
+ public void debug(final Marker arg0, final String arg1, final Object arg2)
+ {
+ }
+
+ public void debug(final Marker arg0, final String arg1, final Object[] arg2)
+ {
+ }
+
+ public void debug(final Marker arg0, final String arg1, final Throwable arg2)
+ {
+ }
+
+ public void debug(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
+ {
+ }
+
+ public void error(final String arg0)
+ {
+ }
+
+ public void error(final String arg0, final Object arg1)
+ {
+ }
+
+ public void error(final String arg0, final Object[] arg1)
+ {
+ }
+
+ public void error(final String arg0, final Throwable arg1)
+ {
+ }
+
+ public void error(final Marker arg0, final String arg1)
+ {
+ }
+
+ public void error(final String arg0, final Object arg1, final Object arg2)
+ {
+ }
+
+ public void error(final Marker arg0, final String arg1, final Object arg2)
+ {
+ }
+
+ public void error(final Marker arg0, final String arg1, final Object[] arg2)
+ {
+ }
+
+ public void error(final Marker arg0, final String arg1, final Throwable arg2)
+ {
+ }
+
+ public void error(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
+ {
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public void info(final String arg0)
+ {
+ }
+
+ public void info(final String arg0, final Object arg1)
+ {
+ }
+
+ public void info(final String arg0, final Object[] arg1)
+ {
+ }
+
+ public void info(final String arg0, final Throwable arg1)
+ {
+ }
+
+ public void info(final Marker arg0, final String arg1)
+ {
+ }
+
+ public void info(final String arg0, final Object arg1, final Object arg2)
+ {
+ }
+
+ public void info(final Marker arg0, final String arg1, final Object arg2)
+ {
+ }
+
+ public void info(final Marker arg0, final String arg1, final Object[] arg2)
+ {
+ }
+
+ public void info(final Marker arg0, final String arg1, final Throwable arg2)
+ {
+ }
+
+ public void info(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
+ {
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return false;
+ }
+
+ public boolean isDebugEnabled(final Marker arg0)
+ {
+ return false;
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return false;
+ }
+
+ public boolean isErrorEnabled(final Marker arg0)
+ {
+ return false;
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return false;
+ }
+
+ public boolean isInfoEnabled(final Marker arg0)
+ {
+ return false;
+ }
+
+ public boolean isTraceEnabled()
+ {
+ return false;
+ }
+
+ public boolean isTraceEnabled(final Marker arg0)
+ {
+ return false;
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return false;
+ }
+
+ public boolean isWarnEnabled(final Marker arg0)
+ {
+ return false;
+ }
+
+ public void trace(final String arg0)
+ {
+ }
+
+ public void trace(final String arg0, final Object arg1)
+ {
+ }
+
+ public void trace(final String arg0, final Object[] arg1)
+ {
+ }
+
+ public void trace(final String arg0, final Throwable arg1)
+ {
+ }
+
+ public void trace(final Marker arg0, final String arg1)
+ {
+ }
+
+ public void trace(final String arg0, final Object arg1, final Object arg2)
+ {
+ }
+
+ public void trace(final Marker arg0, final String arg1, final Object arg2)
+ {
+ }
+
+ public void trace(final Marker arg0, final String arg1, final Object[] arg2)
+ {
+ }
+
+ public void trace(final Marker arg0, final String arg1, final Throwable arg2)
+ {
+ }
+
+ public void trace(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
+ {
+ }
+
+ public void warn(final String arg0)
+ {
+ }
+
+ public void warn(final String arg0, final Object arg1)
+ {
+ }
+
+ public void warn(final String arg0, final Object[] arg1)
+ {
+ }
+
+ public void warn(final String arg0, final Throwable arg1)
+ {
+ }
+
+ public void warn(final Marker arg0, final String arg1)
+ {
+ }
+
+ public void warn(final String arg0, final Object arg1, final Object arg2)
+ {
+ }
+
+ public void warn(final Marker arg0, final String arg1, final Object arg2)
+ {
+ }
+
+ public void warn(final Marker arg0, final String arg1, final Object[] arg2)
+ {
+ }
+
+ public void warn(final Marker arg0, final String arg1, final Throwable arg2)
+ {
+ }
+
+ public void warn(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
+ {
+ }
+
+}
Added: examples/trunk/booking-simplified/src/test/resources/arquillian.xml
===================================================================
--- examples/trunk/booking-simplified/src/test/resources/arquillian.xml (rev 0)
+++ examples/trunk/booking-simplified/src/test/resources/arquillian.xml 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,22 @@
+<arquillian xmlns="http://jboss.com/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:gfembed="urn:arq:org.jboss.arquillian.glassfish.embedded30"
+ xmlns:gfremote="urn:arq:org.jboss.arquillian.container.glassfish.jsr88">
+
+ <engine>
+ <deploymentExportPath>/tmp/</deploymentExportPath>
+ </engine>
+
+ <gfremote:container>
+ <gfremote:httpPort>7070</gfremote:httpPort>
+ </gfremote:container>
+
+ <gfembed:container>
+ <gfembed:resourcesXml>src/test/resources-glassfish/sun-resources.xml</gfembed:resourcesXml>
+ <!--
+ <gfembed:instanceRoot>src/test/gfembed</gfembed:instanceRoot>
+ <gfembed:autoDelete>false</gfembed:autoDelete>
+ -->
+ </gfembed:container>
+
+</arquillian>
Added: examples/trunk/booking-simplified/src/test/resources-glassfish/sun-resources.xml
===================================================================
--- examples/trunk/booking-simplified/src/test/resources-glassfish/sun-resources.xml (rev 0)
+++ examples/trunk/booking-simplified/src/test/resources-glassfish/sun-resources.xml 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE resources PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+ "http://www.sun.com/software/appserver/dtds/sun-resources_1_4.dtd">
+<resources>
+ <jdbc-resource pool-name="ArquillianEmbeddedDerbyPool"
+ jndi-name="jdbc/__arquillian"/>
+ <jdbc-connection-pool name="ArquillianEmbeddedDerbyPool"
+ res-type="javax.sql.DataSource"
+ datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"
+ is-isolation-level-guaranteed="false">
+ <property name="databaseName" value="target/databases/derby"/>
+ <property name="createDatabase" value="create"/>
+ </jdbc-connection-pool>
+ <!--
+ <jdbc-resource pool-name="ArquillianEmbeddedH2Pool"
+ jndi-name="jdbc/__arquillian"/>
+ <jdbc-connection-pool name="ArquillianEmbeddedH2Pool"
+ res-type="javax.sql.DataSource"
+ datasource-classname="org.h2.jdbcx.JdbcDataSource">
+ <property name="user" value="sa"/>
+ <property name="password" value=""/>
+ <property name="url" value="jdbc:h2:file:target/databases/h2/db"/>
+ </jdbc-connection-pool>
+ -->
+</resources>
Added: examples/trunk/booking-simplified/src/test/resources-jbossas/jndi.properties
===================================================================
--- examples/trunk/booking-simplified/src/test/resources-jbossas/jndi.properties (rev 0)
+++ examples/trunk/booking-simplified/src/test/resources-jbossas/jndi.properties 2010-06-11 22:48:12 UTC (rev 13127)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
14 years
- 1
- 0
Seam SVN: r13126 - in modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam: exceptionhandling and 1 other directory.
by seam-commits＠lists.jboss.org
Author: lightguard
Date: 2010-06-11 12:54:52 -0400 (Fri, 11 Jun 2010)
New Revision: 13126
Added:
modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/
modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/ExceptionHandlerTest.java
modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/UnsupportedOperationExceptionHandler.java
Log:
First test, it doesn't work though.
Added: modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/ExceptionHandlerTest.java
===================================================================
--- modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/ExceptionHandlerTest.java (rev 0)
+++ modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/ExceptionHandlerTest.java 2010-06-11 16:54:52 UTC (rev 13126)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.seam.exceptionhandling;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.faces.environment.FacesContextProducer;
+import org.jboss.seam.faces.environment.MockFacesContext;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import static org.junit.Assert.*;
+
+import javax.enterprise.inject.Instance;
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+
+(a)RunWith(Arquillian.class)
+public class ExceptionHandlerTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClass(FacesContextProducer.class)
+ .addClass(UnsupportedOperationExceptionHandler.class)
+ .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ }
+
+ @Inject
+ private Instance<FacesContext> facesContextInstance;
+
+ @Inject
+ private UnsupportedOperationExceptionHandler handler;
+
+ @Test
+ public void testHandlerIsCalled()
+ {
+ new MockFacesContext().set();
+
+ this.facesContextInstance.get().getApplication();
+
+ assertTrue(this.handler.isHandleCalled());
+ }
+}
Property changes on: modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/ExceptionHandlerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/x-java-source
Name: svn:keywords
+ Author Date Id Revision URL
Name: svn:eol-style
+ native
Added: modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/UnsupportedOperationExceptionHandler.java
===================================================================
--- modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/UnsupportedOperationExceptionHandler.java (rev 0)
+++ modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/UnsupportedOperationExceptionHandler.java 2010-06-11 16:54:52 UTC (rev 13126)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.seam.exceptionhandling;
+
+public class UnsupportedOperationExceptionHandler implements ExceptionHandler<UnsupportedOperationException, FacesState>
+{
+ private boolean handleCalled;
+
+ /**
+ * @return the numeric priority of this handler in relationship to
+ * other handlers, 1 being top priority
+ */
+ public int getPriority()
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Method called to execute logic for an uncaught exception.
+ *
+ * @param chain Chain object used to continue handling chain
+ * @param state container for any useful application state
+ * @param e uncaught exception
+ */
+ public void handle(HandlerChain chain, FacesState state, UnsupportedOperationException e)
+ {
+ this.handleCalled = true;
+ }
+
+ public boolean isHandleCalled()
+ {
+ return this.handleCalled;
+ }
+}
Property changes on: modules/faces/branches/exception_handling/impl/src/test/java/org/jboss/seam/exceptionhandling/UnsupportedOperationExceptionHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/x-java-source
Name: svn:keywords
+ Author Date Id Revision URL
Name: svn:eol-style
+ native
14 years
- 1
- 0
Seam SVN: r13125 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-06-11 07:53:39 -0400 (Fri, 11 Jun 2010)
New Revision: 13125
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/EjbSynchronizations.java
Log:
rollbacked the change JBPAPP-3764, JBPAPP-3713
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/EjbSynchronizations.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/EjbSynchronizations.java 2010-06-10 23:51:03 UTC (rev 13124)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/EjbSynchronizations.java 2010-06-11 11:53:39 UTC (rev 13125)
@@ -34,7 +34,7 @@
*/
@Stateful
@Name("org.jboss.seam.transaction.synchronizations")
-(a)Scope(ScopeType.SESSION)
+(a)Scope(ScopeType.EVENT)
@Install(precedence=FRAMEWORK, dependencies="org.jboss.seam.transaction.ejbTransaction")
@BypassInterceptors
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@@ -47,14 +47,12 @@
protected LinkedList<SynchronizationRegistry> synchronizations = new LinkedList<SynchronizationRegistry>();
protected LinkedList<SynchronizationRegistry> committing = new LinkedList<SynchronizationRegistry>();
- @Override
public void afterBegin()
{
log.debug("afterBegin");
synchronizations.addLast( new SynchronizationRegistry() );
}
- @Override
public void beforeCompletion() throws EJBException, RemoteException
{
log.debug("beforeCompletion");
@@ -63,7 +61,6 @@
committing.addLast(sync);
}
- @Override
public void afterCompletion(boolean success) throws EJBException, RemoteException
{
log.debug("afterCompletion");
@@ -84,43 +81,36 @@
}
}
- @Override
public boolean isAwareOfContainerTransactions()
{
return true;
}
- @Override
public void afterTransactionBegin()
{
//noop, let JTA notify us
}
- @Override
public void afterTransactionCommit(boolean success)
{
//noop, let JTA notify us
}
- @Override
public void afterTransactionRollback()
{
//noop, let JTA notify us
}
- @Override
public void beforeTransactionCommit()
{
//noop, let JTA notify us
}
- @Override
public void registerSynchronization(Synchronization sync)
{
synchronizations.getLast().registerSynchronization(sync);
}
- @Override
@Remove
public void destroy() {}
14 years
- 1
- 0