Seam SVN: r13144 - in examples/trunk/booking-simplified: src/main/resources/META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-14 12:54:55 -0400 (Mon, 14 Jun 2010)
New Revision: 13144
Modified:
examples/trunk/booking-simplified/pom.xml
examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml
Log:
Fixed POM and persistence.xml for glassfish profile.
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-14 15:38:31 UTC (rev 13143)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-14 16:54:55 UTC (rev 13144)
@@ -29,9 +29,9 @@
<webapp.directory>src/main/webapp</webapp.directory>
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
- <seam.faces.version>3.0.0-SNAPSHOT</seam.faces.version>
+ <seam.faces.version>3.0.0.Alpha3</seam.faces.version>
<jpamodelgen.version>1.0.0.Final</jpamodelgen.version>
- <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
+ <arquillian.version>1.0.0.Alpha2</arquillian.version>
</properties>
<dependencies>
@@ -158,6 +158,27 @@
<profiles>
<profile>
<id>glassfish</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>1.0.0.Beta4</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>glassfish-embedded</id>
<build>
<plugins>
<!-- Configure the Embedded GlassFish Maven plugin -->
@@ -181,6 +202,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>1.5.10</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>1.0.0.Beta4</version>
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-14 15:38:31 UTC (rev 13143)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-14 16:54:55 UTC (rev 13144)
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
<persistence-unit name="booking">
+ <!--
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <!--
-->
<jta-data-source>jdbc/__default</jta-data-source>
<!--
14 years
Seam SVN: r13143 - in examples/trunk: booking-simplified and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 11:38:31 -0400 (Mon, 14 Jun 2010)
New Revision: 13143
Modified:
examples/trunk/booking-simplified/
examples/trunk/pom.xml
Log:
remove non-working examples, and ignores
Property changes on: examples/trunk/booking-simplified
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
faces-config.NavData
nbactions*
+ .settings
.classpath
.project
faces-config.NavData
nbactions*
target
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2010-06-14 15:36:50 UTC (rev 13142)
+++ examples/trunk/pom.xml 2010-06-14 15:38:31 UTC (rev 13143)
@@ -89,10 +89,7 @@
</dependencyManagement>
<modules>
- <module>booking</module>
- <module>servlet-booking</module>
<module>booking-simplified</module>
- <!--<module>servlet-permalink</module>-->
</modules>
<build>
14 years
Seam SVN: r13141 - examples/trunk/booking-simplified.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 11:36:17 -0400 (Mon, 14 Jun 2010)
New Revision: 13141
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
path to parent
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-14 15:33:40 UTC (rev 13140)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-14 15:36:17 UTC (rev 13141)
@@ -7,6 +7,7 @@
<groupId>org.jboss.seam.examples</groupId>
<artifactId>seam-examples-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.examples</groupId>
14 years
Seam SVN: r13139 - examples/trunk/booking-simplified.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 11:32:48 -0400 (Mon, 14 Jun 2010)
New Revision: 13139
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
split out glassfish/jboss profiles
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-14 14:19:21 UTC (rev 13138)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-14 15:32:48 UTC (rev 13139)
@@ -48,7 +48,7 @@
<artifactId>seam-faces</artifactId>
<version>${seam.faces.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
@@ -73,18 +73,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!--
- <dependency> <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId> <version>1.5.10</version>
- </dependency>
- -->
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -163,44 +151,72 @@
</configuration>
</plugin>
- <!-- Configure the JBoss AS Maven deploy plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <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.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <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>
-
</plugins>
</build>
<profiles>
<profile>
- <id>default</id>
+ <id>glassfish</id>
+ <build>
+ <plugins>
+ <!-- Configure the Embedded GlassFish Maven plugin -->
+ <plugin>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <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>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>1.0.0.Beta4</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jboss</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <build>
+ <plugins>
+
+ <!-- Configure the JBoss AS Maven deploy plugin -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+ <fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
+ </fileNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>1.0.0.Beta4</version>
14 years
Seam SVN: r13138 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 10:19:21 -0400 (Mon, 14 Jun 2010)
New Revision: 13138
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/Confirmed.java
Log:
minor
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-14 14:14:29 UTC (rev 13137)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-14 14:19:21 UTC (rev 13138)
@@ -33,7 +33,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
@@ -128,15 +127,11 @@
}
}
- //@End
public void confirm()
{
em.persist(booking);
// FIXME can't inject event object into bean with passivating scope
- // bookingConfirmedEvent.fire(new BookingEvent(booking));
- manager.fireEvent(new BookingEvent(booking), new AnnotationLiteral<Confirmed>()
- {
- });
+ manager.fireEvent(new BookingEvent(booking), Confirmed.INSTANCE);
log.info(mf.info("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
messages.info(new BundleKey("messages.properties", "booking.confirmed")).textDefault("Booking confirmed.");
conversation.end();
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/Confirmed.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/Confirmed.java 2010-06-14 14:14:29 UTC (rev 13137)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/Confirmed.java 2010-06-14 14:19:21 UTC (rev 13138)
@@ -7,19 +7,27 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Qualifier;
/**
* @author Dan Allen
*/
-@Target({TYPE, METHOD, PARAMETER, FIELD})
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
@Qualifier
public @interface Confirmed
{
+
+ static class ConfirmedLiteral extends AnnotationLiteral<Confirmed> implements Confirmed
+ {
+ private static final long serialVersionUID = -7035985583479407806L;
+ }
+
+ public static final Confirmed INSTANCE = new ConfirmedLiteral();
+
}
14 years
Seam SVN: r13137 - examples/trunk/booking-simplified.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 10:14:29 -0400 (Mon, 14 Jun 2010)
New Revision: 13137
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
use snapshot versions, use cdi-api in provided scope, don't package slf4j
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-14 14:13:05 UTC (rev 13136)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-14 14:14:29 UTC (rev 13137)
@@ -30,6 +30,7 @@
<jboss.domain>default</jboss.domain>
<seam.faces.version>3.0.0-SNAPSHOT</seam.faces.version>
<jpamodelgen.version>1.0.0.Final</jpamodelgen.version>
+ <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
</properties>
<dependencies>
@@ -47,6 +48,12 @@
<artifactId>seam-faces</artifactId>
<version>${seam.faces.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-api</artifactId>
+ <version>${seam.faces.version}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.seam.xml</groupId>
@@ -60,8 +67,15 @@
</dependency>
<dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!--
@@ -79,6 +93,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
14 years
Seam SVN: r13136 - examples/trunk/booking-simplified/src/main/webapp/WEB-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 10:13:05 -0400 (Mon, 14 Jun 2010)
New Revision: 13136
Modified:
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/
Log:
ignores
Property changes on: examples/trunk/booking-simplified/src/main/webapp/WEB-INF
___________________________________________________________________
Name: svn:ignore
- sun-web.xml
+ sun-web.xml
.faces-config.xml.jsfdia
lib
14 years
Seam SVN: r13135 - examples/trunk/booking-simplified.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-14 07:06:12 -0400 (Mon, 14 Jun 2010)
New Revision: 13135
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
don't respecify defaults
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-14 10:14:23 UTC (rev 13134)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-14 11:06:12 UTC (rev 13135)
@@ -99,8 +99,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
<!-- don't waste time on generation -->
<compilerArgument>-proc:none</compilerArgument>
</configuration>
14 years