April 2012 - seam-commits - Jboss List Archives

Seam SVN: r14618 - branches/community/Seam_2_3/examples-ee6.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 05:04:53 -0400 (Fri, 20 Apr 2012) New Revision: 14618 Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: enable hibernate example Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-20 09:00:20 UTC (rev 14617) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-20 09:04:53 UTC (rev 14618) @@ -23,6 +23,7 @@ <module>excel</module> <module>groovybooking</module> <module>guice</module> + <module>hibernate</module> <module>jpa</module> <module>mail</module> <module>messages</module>

12 years

1
0
0 / 0

Seam SVN: r14617 - in branches/community/Seam_2_3/examples-ee6/hibernate: hibernate-tests/src/test/resources-integration and 1 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 05:00:20 -0400 (Fri, 20 Apr 2012) New Revision: 14617 Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/Deployments.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/web.xml Removed: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Log: hibernate example seamtests Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java 2012-04-20 08:42:20 UTC (rev 14616) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java 2012-04-20 09:00:20 UTC (rev 14617) @@ -10,17 +10,29 @@ import javax.faces.model.DataModel; import javax.faces.model.ListDataModel; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Manager; import org.jboss.seam.example.hibernate.Booking; import org.jboss.seam.example.hibernate.Hotel; import org.jboss.seam.example.hibernate.HotelBookingAction; import org.jboss.seam.example.hibernate.User; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; -public class BookingTest extends SeamTest +(a)RunWith(Arquillian.class) +public class BookingTest extends JUnitSeamTest { + @Deployment(name="BookingTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.hibernateDeployment(); + } @Test public void testBookHotel() throws Exception Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java 2012-04-20 08:42:20 UTC (rev 14616) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java 2012-04-20 09:00:20 UTC (rev 14617) @@ -1,15 +1,27 @@ //$Id: ChangePasswordTest.java 6987 2007-12-23 19:53:07Z pmuir $ package org.jboss.seam.example.hibernate.test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Manager; import org.jboss.seam.example.hibernate.User; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; -public class ChangePasswordTest extends SeamTest +(a)RunWith(Arquillian.class) +public class ChangePasswordTest extends JUnitSeamTest { - + @Deployment(name="ChangePasswordTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.hibernateDeployment(); + } + @Test public void testChangePassword() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/Deployments.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/Deployments.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/Deployments.java 2012-04-20 09:00:20 UTC (rev 14617) @@ -0,0 +1,21 @@ +package org.jboss.seam.example.hibernate.test; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +import java.io.File; + +public class Deployments { + public static WebArchive hibernateDeployment() { + WebArchive web = ShrinkWrap.create(ZipImporter.class, "jboss-seam-hibernate.war").importFrom(new File("../hibernate-web/target/jboss-seam-hibernate.war")) + .as(WebArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + return web; + } +} Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java 2012-04-20 08:42:20 UTC (rev 14616) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java 2012-04-20 09:00:20 UTC (rev 14617) @@ -1,14 +1,26 @@ //$Id: LoginTest.java 6987 2007-12-23 19:53:07Z pmuir $ package org.jboss.seam.example.hibernate.test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.core.Manager; import org.jboss.seam.web.Session; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; -public class LoginTest extends SeamTest +(a)RunWith(Arquillian.class) +public class LoginTest extends JUnitSeamTest { - + @Deployment(name="LoginTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.hibernateDeployment(); + } + @Test public void testLoginComponent() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/arquillian.xml 2012-04-20 09:00:20 UTC (rev 14617) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml 2012-04-20 08:42:20 UTC (rev 14616) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml 2012-04-20 09:00:20 UTC (rev 14617) @@ -1,13 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="Hotel Booking" verbose="2" parallel="false"> - - <test name="Hibernate Booking"> - <classes> - <class name="org.jboss.seam.example.hibernate.test.LoginTest"/> - <class name="org.jboss.seam.example.hibernate.test.BookingTest"/> - <class name="org.jboss.seam.example.hibernate.test.ChangePasswordTest"/> - </classes> - </test> - -</suite> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/web.xml 2012-04-20 09:00:20 UTC (rev 14617) @@ -0,0 +1,12 @@ +<?xml version="1.0" ?> + +<web-app version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <listener> + <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class> + </listener> + +</web-app> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 08:42:20 UTC (rev 14616) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 09:00:20 UTC (rev 14617) @@ -4,6 +4,7 @@ <module name="org.javassist" export="true"/> <module name="org.dom4j" export="true"/> <module name="org.hibernate" export="true"/> + <module name="org.hibernate.envers" export="true"/> </dependencies> </deployment> </jboss-deployment-structure>

12 years

1
0
0 / 0

Seam SVN: r14616 - in branches/community/Seam_2_3/examples-ee6/hibernate: hibernate-tests and 6 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 04:42:20 -0400 (Fri, 20 Apr 2012) New Revision: 14616 Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Removed: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/ Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml Log: hibernate example fixes Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -7,14 +7,13 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> <artifactId>hibernate-tests</artifactId> <name>Hibernate Integration Tests Module (EE6)</name> - <version>2.3.0.Beta1-SNAPSHOT</version> <dependencies> <dependency> @@ -27,11 +26,6 @@ <artifactId>jboss-el</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <scope>provided</scope> @@ -39,27 +33,15 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.1.1.Final</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -78,6 +60,11 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> @@ -185,39 +172,6 @@ <profile> <id>ftest-jbossas</id> <properties> - <example.context.path>seam-hibernate</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../hibernate-ear/target/seam-hibernate.ear</param> - </fileNames> - </configuration> - </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> - </build> - </profile> - <profile> - <id>ftest-tomcat</id> - <properties> <example.context.path>jboss-seam-hibernate</example.context.path> </properties> <build> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-20 08:42:20 UTC (rev 14616) @@ -29,7 +29,7 @@ PASSWORD_UPDATED_MESSAGE Password updated PASSWORD_REENTER_MESSAGE verify PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] -PASSWORD_LENGTH_MESSAGE length must be between +PASSWORD_LENGTH_MESSAGE size must be between PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify PASSWORD_SUBMIT id=setpassword:change @@ -66,7 +66,7 @@ REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message REGISTRATION_SUBMIT id=register:register REGISTRATION_REENTER_MESSAGE verify -REGISTRATION_LENGTH_MESSAGE length must be between +REGISTRATION_LENGTH_MESSAGE size must be between REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0} REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists NOT_LOGGED_IN_MESSAGE Please log in first @@ -81,4 +81,4 @@ WORKSPACE_VIEW_TEXT View hotel: {0} WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink WORKSPACE_TABLE_ROW_COUNT = //table[@id\='ConversationListForm\:ConversationListDataTable']/tbody/tr -SPINNER id\=main\:Spinner \ No newline at end of file +SPINNER id\=main\:Spinner Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -6,13 +6,12 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> <artifactId>hibernate-web</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> <packaging>war</packaging> <name>Hibernate Web Module (EE6)</name> @@ -32,18 +31,6 @@ </webResources> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.5.0</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <directory>${project.build.directory}/${project.build.finalName}.war</directory> - </fileNames> - </configuration> - </plugin> </plugins> </build> @@ -53,16 +40,6 @@ <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -75,12 +52,6 @@ </exclusions> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> </dependency> @@ -95,46 +66,14 @@ </exclusions> </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <scope>provided</scope> @@ -142,321 +81,26 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.1.1.Final</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + </dependencies> - - <profiles> - <profile> - <id>jbossas51</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tomcat</id> - <dependencies> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>glassfish2</id> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/glassfish/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/glassfish/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-glassfish-resources</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <overwrite>true</overwrite> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>${basedir}/src/glassfish/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,7 +5,7 @@ <hibernate-configuration> <session-factory name="java:/bookingDatabase"> <property name="show_sql">false</property> - <property name="connection.datasource">java:/DefaultDS</property> + <property name="connection.datasource">java:jboss/datasources/ExampleDS</property> <property name="hbm2ddl.auto">create-drop</property> <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="transaction.flush_before_completion">true</property> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" +<faces-config version="2.1" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"> Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -0,0 +1,9 @@ +<jboss-deployment-structure> + <deployment> + <dependencies> + <module name="org.javassist" export="true"/> + <module name="org.dom4j" export="true"/> + <module name="org.hibernate" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">  Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -105,7 +105,7 @@ <div class="input"> <s:decorate id="creditCardDecorate"> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> + <a:ajax event="blur" render="creditCardDecorate"/> </h:inputText> </s:decorate> </div> @@ -116,7 +116,7 @@ <div class="input"> <s:decorate id="creditCardNameDecorate"> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> + <a:ajax event="blur" render="creditCardNameDecorate"/> </h:inputText> </s:decorate> </div> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -4,12 +4,12 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib"> -<head> +<h:head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>JBoss Suites: Seam Framework</title> <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> +</h:head> +<h:body id="pgHome"> <f:view> <div id="document"> <div id="header"> @@ -45,5 +45,5 @@ <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> </div> </f:view> -</body> +</h:body> </html> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -20,7 +20,7 @@ <h1>Search Hotels</h1> <fieldset> <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + <a:ajax event="keyup" listener="#{hotelSearch.find}" render="searchResults" /> </h:inputText>   <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,12 +5,12 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:a="http://richfaces.org/a4j"> -<head> +<h:head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>JBoss Suites: Seam Framework</title> <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> +</h:head> +<h:body id="pgHome"> <div id="document"> <div id="header"> <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> @@ -43,7 +43,7 @@ <div class="input"> <s:decorate id="usernameDecorate"> <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> + <a:ajax event="blur" render="usernameDecorate"/> </h:inputText> </s:decorate> </div> @@ -54,7 +54,7 @@ <div class="input"> <s:decorate id="nameDecorate"> <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> + <a:ajax event="blur" render="nameDecorate"/> </h:inputText> </s:decorate> </div> @@ -100,5 +100,5 @@ </div> <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> </div> -</body> +</h:body> </html> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -3,12 +3,12 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:s="http://jboss.com/products/seam/taglib"> -<head> +<h:head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>JBoss Suites: Seam Framework</title> <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body> +</h:head> +<h:body> <div id="document"> <div id="header"> @@ -31,5 +31,5 @@ </div> <div id="footer">Created with JBoss Seam, JSF 1.2, Hibernate 3 and Facelets</div> </div> -</body> +</h:body> </html> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,13 +5,12 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.examples-ee6</groupId> <artifactId>hibernate</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> <packaging>pom</packaging> <name>Hibernate Example (EE6)</name> @@ -24,4 +23,16 @@ <module>hibernate-web</module> <module>hibernate-tests</module> </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + </dependencyManagement> + </project>

12 years

1
0
0 / 0

Seam SVN: r14615 - branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 04:08:12 -0400 (Fri, 20 Apr 2012) New Revision: 14615 Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml Log: enable debug in groovybooking again Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 08:04:18 UTC (rev 14614) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) @@ -40,12 +40,10 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId>

12 years

1
0
0 / 0

Seam SVN: r14614 - branches/community/Seam_2_3/examples-ee6.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 04:04:18 -0400 (Fri, 20 Apr 2012) New Revision: 14614 Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: enable guice example Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-20 08:04:18 UTC (rev 14614) @@ -22,6 +22,7 @@ <module>dvdstore</module> <module>excel</module> <module>groovybooking</module> + <module>guice</module> <module>jpa</module> <module>mail</module> <module>messages</module>

12 years

1
0
0 / 0

Seam SVN: r14613 - in branches/community/Seam_2_3/examples-ee6/guice: guice-ear and 10 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 04:03:10 -0400 (Fri, 20 Apr 2012) New Revision: 14613 Added: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml Removed: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/guice/pom.xml Log: guice example fixes Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -4,28 +4,23 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ear</artifactId> <packaging>ear</packaging> <name>Guice EAR Module (EE6)</name> - <properties> - <jboss.home>${env.JBOSS_HOME}</jboss.home> - <jboss.domain>default</jboss.domain> - </properties> - <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-web</artifactId> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <type>ejb</type> </dependency> @@ -34,16 +29,6 @@ <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -58,104 +43,34 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> <configuration> - <version>5</version> + <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir>  <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>  <generateApplicationXml>true</generateApplicationXml> - <jboss> - <version>5</version> - <loader-repository>seam.jboss.org:loader=seam-guice.ear</loader-repository> - </jboss> <modules> <webModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-web</artifactId> <contextRoot>/seam-guice</contextRoot> <bundleFileName>guice-web.war</bundleFileName> </webModule> <ejbModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <bundleFileName>guice-ejb.jar</bundleFileName> </ejbModule> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <bundleFileName>jboss-seam.jar</bundleFileName> + </ejbModule> </modules> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param> - </fileNames> - </configuration> - </plugin> </plugins> </build> - <profiles> - <profile> - <id>exploded</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ear</artifactId> - <type>ear</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <type>war</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.5.0</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> - </fileNames> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Added: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -0,0 +1,13 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.javassist" export="true"/> + <module name="org.apache.log4j" export="true"/> + <module name="org.dom4j" export="true"/> + <module name="org.apache.commons.logging" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + <module name="com.sun.jsf-impl" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -4,11 +4,11 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <packaging>ejb</packaging> <name>Guice EJB Module (EE6)</name> @@ -24,24 +24,20 @@ <artifactId>jboss-seam-ioc</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> -  -  -  -  -  -  - <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> </dependency> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -7,17 +7,17 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-tests</artifactId> <name>Guice Integration Tests Module (EE6)</name> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <type>ejb</type> <scope>test</scope> @@ -29,8 +29,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -65,6 +65,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + </dependency> + </dependencies> <build> @@ -135,17 +140,6 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../guice-ear/target/seam-guice.ear</param> - </fileNames> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> @@ -159,27 +153,5 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-guice</example.context.path> - </properties> - <build> - <plugins> - <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> - </build> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-20 08:03:10 UTC (rev 14613) @@ -1,12 +1,24 @@ package org.jboss.seam.example.guice.test; +import java.io.File; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.example.guice.JuiceBar; import org.jboss.seam.example.guice.Juice; import org.jboss.seam.example.guice.AppleJuice; import org.jboss.seam.example.guice.Orange; import org.jboss.seam.example.guice.OrangeJuice; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; import com.google.inject.Injector; import com.google.inject.Key; @@ -14,8 +26,29 @@ /** * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) */ -public class GuiceTest extends SeamTest +(a)RunWith(Arquillian.class) +public class GuiceTest extends JUnitSeamTest { + @Deployment(name="GuiceTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-guice.ear").importFrom(new File("../guice-ear/target/seam-guice.ear")) + .as(EnterpriseArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + WebArchive web = ear.getAsType(WebArchive.class, "guice-web.war"); + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + web.addClasses(GuiceTest.class); + + JavaArchive ejb = ear.getAsType(JavaArchive.class, "guice-ejb.jar"); + ejb.addClasses(JuiceTestBar.class); + + return ear; + } + @Test public void testGuiceInjector() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/arquillian.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -1,11 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="Guice" verbose="2" parallel="false"> - - <test name="Guice"> - <classes> - <class name="org.jboss.seam.example.guice.test.GuiceTest"/> - </classes> - </test> - -</suite> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/web.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -0,0 +1,12 @@ +<?xml version="1.0" ?> + +<web-app version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <listener> + <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class> + </listener> + +</web-app> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -5,11 +5,11 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-web</artifactId> <packaging>war</packaging> <name>Guice Web Module (EE6)</name> @@ -21,7 +21,7 @@ <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <type>ejb</type> <scope>provided</scope> @@ -30,15 +30,12 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> </dependency> -  -  -  -  <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> @@ -59,10 +56,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> </dependencies> <build> @@ -82,50 +75,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <finalName>jboss-seam-guice</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" +<faces-config version="2.1" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"> Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <display-name>Seam Guice Example</display-name> Modified: branches/community/Seam_2_3/examples-ee6/guice/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) +++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-20 08:03:10 UTC (rev 14613) @@ -3,7 +3,7 @@ <parent> <artifactId>examples-ee6</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,19 +26,19 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-web</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.guice</groupId> <artifactId>guice-ear</artifactId> <version>${project.version}</version> </dependency>

12 years

1
0
0 / 0

Seam SVN: r14612 - in branches/community/Seam_2_3/examples-ee6/groovybooking: groovybooking-tests and 6 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 03:38:42 -0400 (Fri, 20 Apr 2012) New Revision: 14612 Added: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml Removed: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml Log: groovybooking example fixes Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -10,7 +10,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId> <artifactId>groovybooking-tests</artifactId> <name>Groovy Booking Integration Tests Module (EE6)</name> @@ -28,11 +28,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -147,23 +142,12 @@ <profile> <id>ftest-jbossas</id> <properties> - <example.context.path>seam-messages</example.context.path> + <example.context.path>jboss-seam-groovybooking</example.context.path> </properties> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../messages-ear/target/seam-messages.ear</param> - </fileNames> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> @@ -177,27 +161,5 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-messages</example.context.path> - </properties> - <build> - <plugins> - <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> - </build> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-20 07:38:42 UTC (rev 14612) @@ -29,7 +29,7 @@ PASSWORD_UPDATED_MESSAGE Password updated PASSWORD_REENTER_MESSAGE verify PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] -PASSWORD_LENGTH_MESSAGE length must be between +PASSWORD_LENGTH_MESSAGE size must be between PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify PASSWORD_SUBMIT id=setpassword:change @@ -66,7 +66,7 @@ REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message REGISTRATION_SUBMIT id=register:register REGISTRATION_REENTER_MESSAGE verify -REGISTRATION_LENGTH_MESSAGE length must be between +REGISTRATION_LENGTH_MESSAGE size must be between REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0} REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists NOT_LOGGED_IN_MESSAGE Please log in first @@ -81,4 +81,4 @@ WORKSPACE_VIEW_TEXT View hotel: {0} WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink WORKSPACE_TABLE_ROW_COUNT = //table[@id\='ConversationListForm\:ConversationListDataTable']/tbody/tr -SPINNER id\=main\:Spinner \ No newline at end of file +SPINNER id\=main\:Spinner Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -10,7 +10,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId> <artifactId>groovybooking-web</artifactId> <packaging>war</packaging> <name>Groovy Booking Web Module (EE6)</name> @@ -20,6 +20,7 @@ <jndiPattern>java:app/groovybooking-ejb/#{ejbName}</jndiPattern> <debug>true</debug> <loadPersistenceUnits>false</loadPersistenceUnits> + <gmaven.runtime>1.5</gmaven.runtime> </properties> <dependencies> @@ -39,10 +40,12 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -53,35 +56,21 @@ </exclusion> </exclusions> </dependency> -  -  -  -  <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -122,21 +111,20 @@ <artifactId>jboss-el</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -270,19 +258,6 @@    - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.5.0</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/src/jbossas/resources/groovybooking-ds.xml</param> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.war</directory> - </fileNames> - </configuration> - </plugin> </plugins> </build> @@ -308,11 +283,5 @@ </plugins> </build> </profile> - <profile> - <id>jbossas42</id> - <properties> - <loadPersistenceUnits>true</loadPersistenceUnits> - </properties> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -7,7 +7,7 @@ <persistence-unit name="groovy" transaction-type="JTA"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/groovyDatasource</jta-data-source> + <jta-data-source>java:/groovybookingDatasource</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" +<faces-config version="2.1" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"> Added: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -0,0 +1,12 @@ +<jboss-deployment-structure> + <deployment> + <dependencies> +  + <module name="org.dom4j" /> + + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources xmlns="http://www.jboss.org/ironjacamar/schema"> + <datasource + jndi-name="java:/groovybookingDatasource" + enabled="true" + use-java-context="true" pool-name="groovybookingdb"> + <connection-url>jdbc:h2:mem:groovybookingdb;DB_CLOSE_DELAY=-1</connection-url> + <driver>h2</driver> + <security> + <user-name>sa</user-name> + <password>sa</password> + </security> + </datasource> +</datasources> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -1,12 +0,0 @@ -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 4.2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> - -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository> - seam.jboss.org:loader=jboss-seam-groovybooking - <loader-repository-config>java2ParentDelegation=false</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -1,8 +1,8 @@ <?xml version="1.0" ?> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> <context-param> <param-name>org.richfaces.SKIN</param-name> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-20 07:38:42 UTC (rev 14612) @@ -105,7 +105,7 @@ <div class="input"> <s:decorate id="creditCardDecorate"> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> + <a:ajax event="blur" render="creditCardDecorate"/> </h:inputText> </s:decorate> </div> @@ -116,7 +116,7 @@ <div class="input"> <s:decorate id="creditCardNameDecorate"> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> + <a:ajax event="blur" render="creditCardNameDecorate"/> </h:inputText> </s:decorate> </div> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-20 07:38:42 UTC (rev 14612) @@ -20,7 +20,7 @@ <h1>Search Hotels</h1> <fieldset> <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + <a:ajax event="keyup" listener="#{hotelSearch.find}" render="searchResults" /> </h:inputText>   <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-20 07:38:42 UTC (rev 14612) @@ -41,7 +41,7 @@ <div class="input"> <s:decorate id="usernameDecorate"> <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> + <a:ajax event="blur" render="usernameDecorate"/> </h:inputText> </s:decorate> </div> @@ -52,7 +52,7 @@ <div class="input"> <s:decorate id="nameDecorate"> <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> + <a:ajax event="blur" render="nameDecorate"/> </h:inputText> </s:decorate> </div> Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-20 06:48:03 UTC (rev 14611) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-20 07:38:42 UTC (rev 14612) @@ -23,7 +23,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.seam.examples</groupId> + <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId> <artifactId>groovybooking-web</artifactId> <version>${project.version}</version> <type>war</type>

12 years

1
0
0 / 0

[seam/security] ed1b1c: updating OAuth support

by GitHub

Branch: refs/heads/develop Home: https://github.com/seam/security Commit: ed1b1c228bcf1a12c1f3d476eff16210fc55f138 https://github.com/seam/security/commit/ed1b1c228bcf1a12c1f3d476eff16210f... Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M examples/oauth/pom.xml A examples/oauth/src/main/java/org/jboss/seam/security/examples/oauth/HubProducer.java A examples/oauth/src/main/java/org/jboss/seam/security/external/oauth/OAuthAuthenticatorImpl.java A examples/oauth/src/main/java/org/jboss/seam/security/external/oauth/OAuthUser.java A examples/oauth/src/main/java/org/jboss/seam/security/external/oauth/api/OAuthAuthenticator.java M examples/oauth/src/main/resources/META-INF/seam-beans.xml M external/pom.xml M external/src/main/java/org/jboss/seam/security/external/oauth/OAuthAuthenticatorImpl.java Log Message: ----------- updating OAuth support

12 years

1
0
0 / 0

Seam SVN: r14611 - branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-20 02:48:03 -0400 (Fri, 20 Apr 2012) New Revision: 14611 Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF/jboss-seam-booking-ds.xml Log: booking example datasource fix Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF/jboss-seam-booking-ds.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF/jboss-seam-booking-ds.xml 2012-04-19 15:48:58 UTC (rev 14610) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF/jboss-seam-booking-ds.xml 2012-04-20 06:48:03 UTC (rev 14611) @@ -4,11 +4,11 @@ jndi-name="java:/bookingDatasource" enabled="true" use-java-context="true" pool-name="bookingdb"> - <connection-url>jdbc:h2:mem:dvdstoredb;DB_CLOSE_DELAY=-1</connection-url> + <connection-url>jdbc:h2:mem:bookingdb;DB_CLOSE_DELAY=-1</connection-url> <driver>h2</driver> <security> <user-name>sa</user-name> <password>sa</password> </security> </datasource> -</datasources> \ No newline at end of file +</datasources>

12 years

1
0
0 / 0

[forge/core] ec6ac2: FORGE-548

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: ec6ac2156997a4e63bc2e07e5295c0d9bb857b61 https://github.com/forge/core/commit/ec6ac2156997a4e63bc2e07e5295c0d9bb85... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java Log Message: ----------- FORGE-548 Commit: ad62f6d3231f04eeaad34e6a996765a55ab4529f https://github.com/forge/core/commit/ad62f6d3231f04eeaad34e6a996765a55ab4... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java Log Message: ----------- Merge pull request #141 from gastaldi/FORGE-548 FORGE-548: Created ColumnPrinter class Compare: https://github.com/forge/core/compare/29e45c7...ad62f6d

12 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2012