[seam-commits] Seam SVN: r13131 - in examples/trunk: booking-simplified and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Jun 13 14:49:10 EDT 2010
Author: pete.muir at 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>
More information about the seam-commits
mailing list