June 2012 - seam-commits - Jboss List Archives

Seam SVN: r14903 - in branches/enterprise/WFK-2_0/distribution: src/main/assembly and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 11:31:25 -0400 (Mon, 11 Jun 2012) New Revision: 14903 Modified: branches/enterprise/WFK-2_0/distribution/pom.xml branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml Log: added richfaces into distribution for seam-gen Modified: branches/enterprise/WFK-2_0/distribution/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-11 15:31:15 UTC (rev 14902) +++ branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-11 15:31:25 UTC (rev 14903) @@ -212,5 +212,27 @@ <artifactId>jboss-seam-ui</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> </dependencies> </project> Modified: branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml =================================================================== --- branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-11 15:31:15 UTC (rev 14902) +++ branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-11 15:31:25 UTC (rev 14903) @@ -35,7 +35,7 @@ <include>seam21migration.txt</include> <include>seam23migration.txt</include> <include>seam2migration.txt</include> - <include>clustering-howto.txt</include> + <include>seam</include> <include>seam.bat</include> </includes> @@ -110,6 +110,21 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> </dependencySet> +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + + <includes> + <include>org.richfaces.core:richfaces-core-api</include> + <include>org.richfaces.core:richfaces-core-impl</include> + <include>org.richfaces.ui:richfaces-components-api</include> + <include>org.richfaces.ui:richfaces-components-ui</include> + <include>net.sourceforge.cssparser:cssparser</include> + <include>org.w3c.css:sac</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + </dependencySet>  <dependencySet>

11 years, 10 months

1
0
0 / 0

Seam SVN: r14902 - branches/enterprise/WFK-2_0/examples-ee6.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 11:31:15 -0400 (Mon, 11 Jun 2012) New Revision: 14902 Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml Log: added plugins versions for examples Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-11 15:20:46 UTC (rev 14901) +++ branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-11 15:31:15 UTC (rev 14902) @@ -8,7 +8,39 @@ <name>Seam 2 EE 6 examples</name> <description>Examples for Seam 2 Framework in Java EE6 environment</description> + <url>http://seamframework.org/Seam2</url> + <licenses> + <license> + <name>LGPL</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> + </license> + </licenses> + + <developers> + <developer> + <name>JBoss Seam committers</name> + </developer> + </developers> + + <mailingLists> + <mailingList> + <archive>http://lists.jboss.org/pipermail/seam-dev/</archive> + <name>Seam Developer List</name> + </mailingList> + </mailingLists> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/seam/branches/enterprise/WFK-2_0</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/branches/enterprise/WFK-2_0</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/seam/branches/enterprise/WFK-2_0</url> + </scm> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + <properties>  @@ -40,6 +72,25 @@ <jboss.domain>default</jboss.domain> <catalina.home>${env.CATALINA_HOME}</catalina.home> <xml.namespace.aware>false</xml.namespace.aware> + +  +  +  + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + +  + <maven.compiler.argument.target>${maven.compiler.target}</maven.compiler.argument.target> + <maven.compiler.argument.source>${maven.compiler.source}</maven.compiler.argument.source> + </properties> <modules> @@ -76,10 +127,27 @@ <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> + <version>2.12</version> <configuration> <excludedGroups>${tests.excludedGroups}</excludedGroups> </configuration> </plugin> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <version>2.7</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + </plugin> +  <plugin> @@ -130,6 +198,7 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> + <version>2.1.1</version> <inherited>true</inherited> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml>

11 years, 10 months

1
0
0 / 0

Seam SVN: r14901 - branches/enterprise/WFK-2_0/examples-ee6/openid/openid-tests.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-06-11 11:20:46 -0400 (Mon, 11 Jun 2012) New Revision: 14901 Modified: branches/enterprise/WFK-2_0/examples-ee6/openid/openid-tests/pom.xml Log: fix jsf api dependency in openid example tests Modified: branches/enterprise/WFK-2_0/examples-ee6/openid/openid-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/openid/openid-tests/pom.xml 2012-06-11 10:35:25 UTC (rev 14900) +++ branches/enterprise/WFK-2_0/examples-ee6/openid/openid-tests/pom.xml 2012-06-11 15:20:46 UTC (rev 14901) @@ -36,8 +36,9 @@ <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.1_spec</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId>

11 years, 10 months

1
0
0 / 0

[forge/core] 7dac73: Add a customized HtmlSearchWidgetBuilder.

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: 7dac73cf0ea2eacf33aec8bb4703c0768caf276a https://github.com/forge/core/commit/7dac73cf0ea2eacf33aec8bb4703c0768caf... Author: Ryan Bradley <rbradley(a)redhat.com> Date: 2012-06-08 (Fri, 08 Jun 2012) Changed paths: A scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/HtmlSearchWidgetBuilder.java Log Message: ----------- Add a customized HtmlSearchWidgetBuilder. Provides some functionality as HtmlWidgetBuilder, except always adds an empty option to select menu. Commit: 4865dee31ce9a1e386aeca20fccf43ea77cd14b2 https://github.com/forge/core/commit/4865dee31ce9a1e386aeca20fccf43ea77cd... Author: Ryan Bradley <rbradley(a)redhat.com> Date: 2012-06-08 (Fri, 08 Jun 2012) Changed paths: A scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/HtmlSearchWidgetBuilderTest.java Log Message: ----------- Add HtmlSearchWidgetBuilderTest to test HtmlSearchWidgetBuilder. Commit: 9946a05f27963580acab675d209c999fcb331ecf https://github.com/forge/core/commit/9946a05f27963580acab675d209c999fcb33... Author: Ryan Bradley <rbradley(a)redhat.com> Date: 2012-06-08 (Fri, 08 Jun 2012) Changed paths: M scaffold-faces/src/main/resources/scaffold/faces/metawidget-search.xml Log Message: ----------- Replace HtmlWidgetBuilder with HtmlSearchWidgetBuilder in metawidget-search configuration. Commit: 1e03caf22fb3d6b8c9c308fd0213fb3413bb9cf3 https://github.com/forge/core/commit/1e03caf22fb3d6b8c9c308fd0213fb3413bb... Author: Ryan Bradley <rbradley(a)redhat.com> Date: 2012-06-08 (Fri, 08 Jun 2012) Changed paths: M scaffold-faces/src/main/resources/scaffold/faces/search.xhtml Log Message: ----------- FORGE-587: Wrap <h:panelGroup> in <f:validateBean disabled="true"> so that validation is not performed on search operation. Commit: cbf3b3ee3f7a3d1443be6e4d29f238e2e482e491 https://github.com/forge/core/commit/cbf3b3ee3f7a3d1443be6e4d29f238e2e482... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-06-11 (Mon, 11 Jun 2012) Changed paths: A scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/HtmlSearchWidgetBuilder.java M scaffold-faces/src/main/resources/scaffold/faces/metawidget-search.xml M scaffold-faces/src/main/resources/scaffold/faces/search.xhtml A scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/HtmlSearchWidgetBuilderTest.java Log Message: ----------- Merge pull request #163 from ryanbradley/FORGE-587/589 FORGE-587 and FORGE-589 like a JBoss Compare: https://github.com/forge/core/compare/badb418...cbf3b3e

11 years, 10 months

1
0
0 / 0

Seam SVN: r14900 - branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse.

by seam-commits＠lists.jboss.org

Author: dhinojosa Date: 2012-06-11 06:35:25 -0400 (Mon, 11 Jun 2012) New Revision: 14900 Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath Log: Another attempt at .classpath management for new JBT Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2012-06-11 07:50:23 UTC (rev 14899) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2012-06-11 10:35:25 UTC (rev 14900) @@ -4,7 +4,6 @@ <classpathentry kind="src" output="classes/hot" path="src/hot"/> <classpathentry kind="src" output="classes/test" path="src/test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="bootstrap"/> <classpathentry kind="lib" path="lib/hibernate-validator.jar"/> <classpathentry kind="lib" path="lib/hibernate-core.jar"/> <classpathentry kind="lib" path="lib/hibernate-annotations.jar"/> @@ -19,8 +18,9 @@ <classpathentry kind="lib" path="lib/jgroups.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/jsf-api.jar"/> + <classpathentry kind="lib" path="lib/test/jboss-as-embedded-7.1.1.Final.ja"/> <classpathentry kind="lib" path="lib/servlet-api.jar"/> - <classpathentry kind="lib" path="lib/testng-jdk15.jar"/> + <classpathentry kind="lib" path="lib/testng.jar"/> <classpathentry kind="lib" path="lib/jboss-el.jar"/> <classpathentry kind="lib" path="lib/el-api.jar"/> <classpathentry kind="lib" path="lib/mvel2.jar"/>

11 years, 10 months

1
0
0 / 0

Seam SVN: r14899 - branches/enterprise/WFK-2_0/distribution/src/main/assembly.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 03:50:23 -0400 (Mon, 11 Jun 2012) New Revision: 14899 Modified: branches/enterprise/WFK-2_0/distribution/src/main/assembly/readme.txt Log: bz #828123 distribution readme.txt updated by instruction for EAP Modified: branches/enterprise/WFK-2_0/distribution/src/main/assembly/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/distribution/src/main/assembly/readme.txt 2012-06-11 07:49:12 UTC (rev 14898) +++ branches/enterprise/WFK-2_0/distribution/src/main/assembly/readme.txt 2012-06-11 07:50:23 UTC (rev 14899) @@ -1,7 +1,7 @@ JBoss Seam - Contextual Component framework for Java EE ========================================================= -version 2.3.0.Beta2, May 2012 +version 2.3.0.Beta2-redhat-1, May 2012 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt). @@ -9,7 +9,7 @@ Get Up And Running Quick ------------------------ -1. Install JBoss AS 7.1.1.Final +1. Install JBoss EAP 6.0.x 2. Start JBoss AS by typing "bin/standalone.sh" in the JBoss home directory @@ -29,7 +29,7 @@ Learn more ---------- -* Read the documentation in the "doc/reference/en-US" directory +* Read the online documentation * Read the online FAQ http://www.seamframework.org/Seam2 Notes for this release

11 years, 10 months

1
0
0 / 0

Seam SVN: r14898 - in branches/enterprise/WFK-2_0/examples-ee6: jpa and 1 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 03:49:12 -0400 (Mon, 11 Jun 2012) New Revision: 14898 Removed: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/ Log: removed empty dirs after doing git svn dcommit

11 years, 10 months

1
0
0 / 0

Seam SVN: r14897 - in branches/enterprise/WFK-2_0/examples-ee6: blog and 89 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 03:39:53 -0400 (Mon, 11 Jun 2012) New Revision: 14897 Removed: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-jboss405.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat55.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat6.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-weblogic92.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-websphere61.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-jboss405.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat55.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat6.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic10.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic92.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere61.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere7.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/readme.txt branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/seam.properties branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/seam.properties branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/seam.properties branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/seam.properties branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/seam.properties branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/Progress.java branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarAction.java branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarLocal.java branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/META-INF/ejb-jar.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/seam.properties branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/components.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/web.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/complete.xhtml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/index.html branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/progressbar.xhtml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/slider.js branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/readme.txt Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/readme.txt branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/booking/booking-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/readme.txt branches/enterprise/WFK-2_0/examples-ee6/excel/readme.txt branches/enterprise/WFK-2_0/examples-ee6/groovybooking/readme.txt branches/enterprise/WFK-2_0/examples-ee6/hibernate/readme.txt branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/itext/itext-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/itext/readme.txt branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/readme.txt branches/enterprise/WFK-2_0/examples-ee6/mail/mail-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/mail/readme.txt branches/enterprise/WFK-2_0/examples-ee6/messages/messages-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/messages/messages-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/messages/readme.txt branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/readme.txt branches/enterprise/WFK-2_0/examples-ee6/openid/openid-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/openid/readme.txt branches/enterprise/WFK-2_0/examples-ee6/pom.xml branches/enterprise/WFK-2_0/examples-ee6/quartz/readme.txt branches/enterprise/WFK-2_0/examples-ee6/readme.txt branches/enterprise/WFK-2_0/examples-ee6/registration/readme.txt branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/registration/registration-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/readme.txt branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/readme.txt branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/readme.txt branches/enterprise/WFK-2_0/examples-ee6/restbay/readme.txt branches/enterprise/WFK-2_0/examples-ee6/seambay/readme.txt branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/readme.txt branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seampay/readme.txt branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamspace/readme.txt branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/spring/readme.txt branches/enterprise/WFK-2_0/examples-ee6/tasks/readme.txt branches/enterprise/WFK-2_0/examples-ee6/ui/readme.txt branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml Log: bz #828299 removed all other profiles/configurations not related to JBoss AS7 and updated readme.txt for examples Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -134,146 +134,5 @@ </plugins> </build> </profile> - <profile> - <id>jbossas6</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>${hibernate.search.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-analyzers</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-snowball</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-snowball</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - </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>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -104,223 +104,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>jbossas51</id> - <build> - <plugins> - <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/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas6</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>${hibernate.search.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-analyzers</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-lucene-snowball</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-snowball</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${org.apache.lucene.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <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/jboss6/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - </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>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <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/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tomcat</id> - <build> - <plugins> - <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/jboss5/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -176,27 +176,5 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-blog</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/enterprise/WFK-2_0/examples-ee6/blog/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,10 @@ Seam Blog Example ================= -This example demonstrates the use of Seam in a Java EE 5 environment. +This example demonstrates the use of Seam in a Java EE environment. Transaction and persistence context management is handled by the EJB container. -To deploy the example to JBossAS 5, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,24 +14,6 @@ * In the blog-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-blog - - -JBossAS 4.2 needs additional Hibernate libraries, use a -Pjbossas42 maven profile instead to -package the application. - -JBossAS 6 needs new Hibernate Search with dependencies, and more source code enhancement due to -Hibernate Search and Lucene-Core API changes. Use a -Pjbossas6 maven profile instead to package -the application. - -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from blog-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-blog Modified: branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -127,14 +127,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -191,28 +183,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-booking</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/enterprise/WFK-2_0/examples-ee6/booking/booking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/booking/booking-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/booking/booking-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -126,74 +126,5 @@ </plugins> </build> </profile> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.booking</groupId> - <artifactId>booking-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-booking</finalName> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../booking-ear/src/main/resources</directory> - <includes> - <include>jboss-seam-booking-ds.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -136,14 +136,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -178,27 +170,5 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>seam-contactlist</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/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -91,50 +91,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.contactlist</groupId> - <artifactId>contactlist-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>seam-contactlist</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/contactlist/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -4,7 +4,7 @@ This example demonstrates the Seam CRUD framework. It runs on JBoss AS as an EAR and Tomcat with JBoss Embedded as a WAR. -To deploy the example to JBossAS 4, JBossAS 5 or JBossAS 6, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +14,5 @@ * In the contactlist-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy -* Open this URL in a web browser: http://localhost:8080/seam-contactlist - -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from contactlist-web/target directory to Tomcat manually - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-contactlist Modified: branches/enterprise/WFK-2_0/examples-ee6/excel/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/excel/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/excel/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,8 +1,7 @@ Seam Excel Example ================== -This example demonstrates the Seam Excel functionality. It runs on JBoss AS7 as -an EAR. +This example demonstrates the Seam Excel functionality. To deploy the example to JBoss AS7 , follow these steps: @@ -14,8 +13,8 @@ * Start the AS7 up. -* Deploy the sample: +* Go to excel-ear directory and deply the sample by running: + + mvn jboss-as:deploy - $JBOSS_HOME/bin/jboss-cli.sh --connect 'deploy excel-ear/target/seam-excel.ear' - * Open this URL in a web browser: http://localhost:8080/seam-excel Modified: branches/enterprise/WFK-2_0/examples-ee6/groovybooking/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/groovybooking/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/groovybooking/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,10 +2,9 @@ ========================== This is the Hotel Booking example implemented in Groovy Beans and Hibernate JPA. -This application runs on JBoss AS, but is deployed as an *exploded* WAR rather -than an EAR. +The application is deployed as an *exploded* WAR rather than an EAR. -To deploy the example to JBossAS 5, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -15,9 +14,6 @@ * In the groovybooking-web directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy -When deploying to JBossAS 4, use a -Pjbossas42 maven profile to package the -application. - * Open this URL in a web browser: http://localhost:8080/jboss-seam-groovybooking Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-jboss405.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-jboss405.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-jboss405.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for JBoss 4.0.5"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-jboss" /> - <property name="dist.dir" value="dist-jboss405" /> - <property name="exploded-archives.dir" value="exploded-archives-jboss405" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar"/> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat55.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat55.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat55.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,57 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for plain Tomcat 5.5"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat55" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/log4j.jar" /> - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/dom4j.jar" /> - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/javassist.jar"/> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - <include name="lib/persistence-api.jar" /> - <include name="lib/el-api.jar" /> - <include name="lib/cglib.jar"/> - <include name="lib/jta.jar"/> - <include name="lib/antlr.jar" /> -  - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat6.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat6.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-tomcat6.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,53 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for plain Tomcat 6.0" /> - <property name="example.name" value="jboss-seam-hibernate" /> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat6" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat6" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/log4j.jar"/> - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/dom4j.jar" /> - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/asm.jar" /> - <include name="lib/javassist.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/jta.jar" /> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-weblogic92.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-weblogic92.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-weblogic92.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,60 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for WebLogic 9.2"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-weblogic92" /> - <property name="dist.dir" value="dist-weblogic92" /> - <property name="exploded-archives.dir" value="exploded-archives-weblogic92" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar" /> - -  - <include name="lib/jta.jar" /> - <include name="lib/commons-beanutils.jar" /> - <include name="lib/commons-digester.jar" /> - <include name="lib/commons-collections.jar" /> - <include name="lib/commons-logging.jar" /> - -  - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/antlr.jar" /> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-websphere61.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-websphere61.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/build-websphere61.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,59 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for WebSphere 6.1.0.9" /> - <property name="example.name" value="jboss-seam-hibernate" /> - -  - <property name="resources.dir" value="resources-websphere61" /> - <property name="dist.dir" value="dist-websphere61" /> - <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar"/> - -  - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-collections.jar"/> - -  - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/persistence-api.jar" /> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - <include name="lib/cglib.jar"/> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - <include name="META-INF/*.taglib.xml" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:init debug="true"/> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true" - session-factory-jndi-name="bookingDatabase"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - 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"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,20 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">examples-dataSource-demoPool</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">org.hibernate.dialect.PointbaseDialect</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.WeblogicTransactionManagerLookup</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> -<namespace>http://richfaces.org/a4j</namespace> - -<tag> - <tag-name>ajaxListener</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxListenerHandler - </handler-class> - - </tag><tag> - <tag-name>facet</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.FacetHandler - </handler-class> - - </tag><tag> - <tag-name>keepAlive</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.KeepAliveHandler - </handler-class> - </tag><tag> - <tag-name>jsFunction</tag-name> - <component> - <component-type>org.ajax4jsf.Function</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxFunctionRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>status</tag-name> - <component> - <component-type>org.ajax4jsf.Status</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxStatusRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>portlet</tag-name> - <component> - <component-type>org.ajax4jsf.Portlet</component-type> - </component> - - </tag><tag> - <tag-name>push</tag-name> - <component> - <component-type>org.ajax4jsf.Push</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPushRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxPushHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>repeat</tag-name> - <component> - <component-type>org.ajax4jsf.Repeat</component-type> - <renderer-type> - org.ajax4jsf.components.RepeatRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>commandButton</tag-name> - <component> - <component-type>org.ajax4jsf.CommandButton</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxCommandButtonRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>actionparam</tag-name> - <component> - <component-type>org.ajax4jsf.ActionParameter</component-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.ActionParamHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>loadScript</tag-name> - <component> - <component-type>org.ajax4jsf.LoadScript</component-type> - <renderer-type> - org.ajax4jsf.LoadScriptRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>outputPanel</tag-name> - <component> - <component-type>org.ajax4jsf.OutputPanel</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxOutputPanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>loadBundle</tag-name> - <component> - <component-type>org.ajax4jsf.Bundle</component-type> - </component> - - </tag><tag> - <tag-name>mediaOutput</tag-name> - <component> - <component-type>org.ajax4jsf.MediaOutput</component-type> - <renderer-type> - org.ajax4jsf.MediaOutputRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.MediaOutputHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>log</tag-name> - <component> - <component-type>org.ajax4jsf.Log</component-type> - <renderer-type> - org.ajax4jsf.LogRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>region</tag-name> - <component> - <component-type>org.ajax4jsf.AjaxRegion</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxRegionRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>form</tag-name> - <component> - <component-type>org.ajax4jsf.Form</component-type> - <renderer-type> - org.ajax4jsf.FormRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>htmlCommandLink</tag-name> - <component> - <component-type>javax.faces.HtmlCommandLink</component-type> - <renderer-type> - org.ajax4jsf.HtmlCommandLinkRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>commandLink</tag-name> - <component> - <component-type>org.ajax4jsf.CommandLink</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxCommandLinkRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>support</tag-name> - <component> - <component-type>org.ajax4jsf.Support</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxSupportRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>loadStyle</tag-name> - <component> - <component-type>org.ajax4jsf.LoadStyle</component-type> - <renderer-type> - org.ajax4jsf.LoadStyleRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>poll</tag-name> - <component> - <component-type>org.ajax4jsf.Poll</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPollRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>page</tag-name> - <component> - <component-type>org.ajax4jsf.components.Page</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPageRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>include</tag-name> - <component> - <component-type>org.ajax4jsf.Include</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxIncludeRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.IncludeHandler - </handler-class> - </component> - - </tag> -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.jsf.core.CoreLibrary</library-class> -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.jsf.html.HtmlLibrary</library-class> -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.ui.UILibrary</library-class> -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,546 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> -<namespace>http://richfaces.org/rich</namespace> - -<tag> - <tag-name>dndParam</tag-name> - <component> - <component-type>org.richfaces.DndParam</component-type> - </component> - - </tag><tag> - <tag-name>dropSupport</tag-name> - <component> - <component-type>org.richfaces.DropSupport</component-type> - <renderer-type> - org.richfaces.DropSupportRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DropSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dragIndicator</tag-name> - <component> - <component-type>org.richfaces.DragIndicator</component-type> - <renderer-type> - org.richfaces.DragIndicatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dragSupport</tag-name> - <component> - <component-type>org.richfaces.DragSupport</component-type> - <renderer-type> - org.richfaces.DragSupportRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DragSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dropListener</tag-name> - <handler-class> - org.richfaces.taglib.DropListenerHandler - </handler-class> - - </tag><tag> - <tag-name>dragListener</tag-name> - <handler-class> - org.richfaces.taglib.DragListenerHandler - </handler-class> - - </tag><tag> - <tag-name>effect</tag-name> - <component> - <component-type>org.richfaces.Effect</component-type> - <renderer-type> - org.richfaces.EffectRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panel</tag-name> - <component> - <component-type>org.richfaces.panel</component-type> - <renderer-type> - org.richfaces.PanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelBar</tag-name> - <component> - <component-type>org.richfaces.PanelBar</component-type> - <renderer-type> - org.richfaces.PanelBarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelBarItem</tag-name> - <component> - <component-type>org.richfaces.PanelBarItem</component-type> - <renderer-type> - org.richfaces.PanelBarItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataFilterSlider</tag-name> - <component> - <component-type>org.richfaces.DataFilterSlider</component-type> - <renderer-type> - org.richfaces.DataFilterSliderRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DataFilterSliderTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>sliderListener</tag-name> - <handler-class> - org.richfaces.taglib.DataFilterSliderListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>gmap</tag-name> - <component> - <component-type>org.richfaces.Gmap</component-type> - <renderer-type> - org.richfaces.GmapRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>virtualEarth</tag-name> - <component> - <component-type>org.richfaces.VirtualEarth</component-type> - <renderer-type> - org.richfaces.VirtualEarthRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>separator</tag-name> - <component> - <component-type>org.richfaces.separator</component-type> - <renderer-type> - org.richfaces.SeparatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>spacer</tag-name> - <component> - <component-type>org.richfaces.spacer</component-type> - <renderer-type> - org.richfaces.SpacerRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>paint2D</tag-name> - <component> - <component-type>org.richfaces.Paint2D</component-type> - <renderer-type> - org.richfaces.Paint2DRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.Paint2DTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>togglePanel</tag-name> - <component> - <component-type>org.richfaces.TogglePanel</component-type> - <renderer-type> - org.richfaces.TogglePanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>toggleControl</tag-name> - <component> - <component-type>org.richfaces.ToggleControl</component-type> - <renderer-type> - org.richfaces.ToggleControlRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>tabPanel</tag-name> - <component> - <component-type>org.richfaces.TabPanel</component-type> - <renderer-type> - org.richfaces.TabPanelRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TabPanelTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>tab</tag-name> - <component> - <component-type>org.richfaces.Tab</component-type> - <renderer-type> - org.richfaces.TabRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>simpleTogglePanel</tag-name> - <component> - <component-type>org.richfaces.SimpleTogglePanel</component-type> - <renderer-type> - org.richfaces.SimpleTogglePanelRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.SimpleTogglePanelTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>toolBar</tag-name> - <component> - <component-type>org.richfaces.ToolBar</component-type> - <renderer-type> - org.richfaces.ToolBarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>toolBarGroup</tag-name> - <component> - <component-type>org.richfaces.ToolBarGroup</component-type> - <renderer-type> - org.richfaces.ToolBarGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>inputNumberSlider</tag-name> - <component> - <component-type>org.richfaces.inputNumberSlider</component-type> - <renderer-type> - org.richfaces.InputNumberSliderRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>inputNumberSpinner</tag-name> - <component> - <component-type>org.richfaces.inputNumberSpinner</component-type> - <renderer-type> - org.richfaces.InputNumberSpinnerRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>tree</tag-name> - <component> - <component-type>org.richfaces.Tree</component-type> - <renderer-type> - org.richfaces.TreeRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TreeTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>treeNode</tag-name> - <component> - <component-type>org.richfaces.TreeNode</component-type> - <renderer-type> - org.richfaces.TreeNodeRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TreeNodeTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dropListener</tag-name> - <handler-class> - org.richfaces.taglib.DropListenerHandler - </handler-class> - - </tag><tag> - <tag-name>dragListener</tag-name> - <handler-class> - org.richfaces.taglib.DragListenerHandler - </handler-class> - - </tag><tag> - <tag-name>changeExpandListener</tag-name> - <handler-class> - org.richfaces.taglib.ChangeExpandListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>nodeSelectListener</tag-name> - <handler-class> - org.richfaces.taglib.NodeSelectListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>suggestionbox</tag-name> - <component> - <component-type>org.richfaces.SuggestionBox</component-type> - <renderer-type> - org.richfaces.SuggestionBox - </renderer-type> - <handler-class> - org.richfaces.taglib.SuggestionBoxTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>subTable</tag-name> - <component> - <component-type>org.richfaces.SubTable</component-type> - <renderer-type> - org.richfaces.SubTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>column</tag-name> - <component> - <component-type>org.richfaces.Column</component-type> - <renderer-type> - org.richfaces.ColumnRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataList</tag-name> - <component> - <component-type>org.richfaces.DataList</component-type> - <renderer-type> - org.richfaces.DataListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataOrderedList</tag-name> - <component> - <component-type>org.richfaces.DataOrderedList</component-type> - <renderer-type> - org.richfaces.DataOrderedListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataDefinitionList</tag-name> - <component> - <component-type>org.richfaces.DataDefinitionList</component-type> - <renderer-type> - org.richfaces.DataDefinitionListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataGrid</tag-name> - <component> - <component-type>org.richfaces.DataGrid</component-type> - <renderer-type> - org.richfaces.DataGridRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataTable</tag-name> - <component> - <component-type>org.richfaces.DataTable</component-type> - <renderer-type> - org.richfaces.DataTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>columnGroup</tag-name> - <component> - <component-type>org.richfaces.ColumnGroup</component-type> - <renderer-type> - org.richfaces.ColumnGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>modalPanel</tag-name> - <component> - <component-type>org.richfaces.ModalPanel</component-type> - <renderer-type> - org.richfaces.ModalPanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>datascroller</tag-name> - <component> - <component-type>org.richfaces.Datascroller</component-type> - <renderer-type> - org.richfaces.DataScrollerRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DataScrollerTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>scrollerListener</tag-name> - <handler-class> - org.richfaces.taglib.DataScrollerListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>menuGroup</tag-name> - <component> - <component-type>org.richfaces.MenuGroup</component-type> - <renderer-type> - org.richfaces.MenuGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>menuItem</tag-name> - <component> - <component-type>org.richfaces.MenuItem</component-type> - <renderer-type> - org.richfaces.MenuItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>menuSeparator</tag-name> - <component> - <component-type>org.richfaces.MenuSeparator</component-type> - <renderer-type> - org.richfaces.MenuSeparatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dropDownMenu</tag-name> - <component> - <component-type>org.richfaces.DropDownMenu</component-type> - <renderer-type> - org.richfaces.DropDownMenuRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DropDownMenuTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>toolTip</tag-name> - <component> - <component-type>org.richfaces.component.ToolTip</component-type> - <renderer-type> - org.richfaces.renderkit.html.ToolTipRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenu</tag-name> - <component> - <component-type>org.richfaces.PanelMenu</component-type> - <renderer-type> - org.richfaces.PanelMenuRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenuGroup</tag-name> - <component> - <component-type>org.richfaces.PanelMenuGroup</component-type> - <renderer-type> - org.richfaces.PanelMenuGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenuItem</tag-name> - <component> - <component-type>org.richfaces.PanelMenuItem</component-type> - <renderer-type> - org.richfaces.PanelMenuItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>calendar</tag-name> - <component> - <component-type>org.richfaces.Calendar</component-type> - <renderer-type> - org.richfaces.CalendarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>currentDateChangeListener</tag-name> - <handler-class> - org.richfaces.taglib.CurrentDateChangeListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>treeNodesAdaptor</tag-name> - <component> - <component-type>org.richfaces.TreeNodesAdaptor</component-type> - </component> - - </tag><tag> - <tag-name>recursiveTreeNodesAdaptor</tag-name> - <component> - <component-type>org.richfaces.RecursiveTreeNodesAdaptor</component-type> - </component> - - </tag><tag> - <tag-name>message</tag-name> - <component> - <component-type>org.richfaces.component.RichMessage</component-type> - <renderer-type> - org.richfaces.RichMessageRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>messages</tag-name> - <component> - <component-type>org.richfaces.component.RichMessages</component-type> - <renderer-type> - org.richfaces.RichMessagesRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>scrollableDataTable</tag-name> - <component> - <component-type>org.richfaces.component.ScrollableDataTable</component-type> - <renderer-type> - org.richfaces.renderkit.html.ScrollableDataTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>insert</tag-name> - <component> - <component-type>org.richfaces.ui.Insert</component-type> - <renderer-type> - org.richfaces.ui.InsertRenderer - </renderer-type> - </component> - - </tag> -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> - <namespace>http://jboss.org/schema/seam/taglib</namespace> - - - - <tag> - <tag-name>button</tag-name> - <component> - <component-type>org.jboss.seam.ui.Button</component-type> - <renderer-type>org.jboss.seam.ui.ButtonRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>cache</tag-name> - <component> - <component-type>org.jboss.seam.ui.Cache</component-type> - <renderer-type>org.jboss.seam.ui.CacheRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>conversationId</tag-name> - <component> - <component-type>org.jboss.seam.ui.ConversationId</component-type> - </component> - </tag> - <tag> - <tag-name>conversationPropagation</tag-name> - <component> - <component-type>org.jboss.seam.ui.ConversationPropagation</component-type> - </component> - </tag> - <tag> - <tag-name>decorate</tag-name> - <component> - <component-type>org.jboss.seam.ui.Decorate</component-type> - <renderer-type>org.jboss.seam.ui.DecorateRenderer</renderer-type> - <handler-class>org.jboss.seam.ui.handler.DecorateHandler</handler-class> - </component> - </tag> - <tag> - <tag-name>div</tag-name> - <component> - <component-type>org.jboss.seam.ui.Div</component-type> - <renderer-type>org.jboss.seam.ui.DivRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>enumItem</tag-name> - <component> - <component-type>org.jboss.seam.ui.EnumItem</component-type> - </component> - </tag> - <tag> - <tag-name>fileUpload</tag-name> - <component> - <component-type>org.jboss.seam.ui.FileUpload</component-type> - <renderer-type>org.jboss.seam.ui.FileUploadRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>formattedText</tag-name> - <component> - <component-type>org.jboss.seam.ui.FormattedText</component-type> - <renderer-type>org.jboss.seam.ui.FormattedTextRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>fragment</tag-name> - <component> - <component-type>org.jboss.seam.ui.Fragment</component-type> - <renderer-type>org.jboss.seam.ui.FragmentRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>graphicImage</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.GraphicImage</component-type> - <renderer-type>org.jboss.seam.ui.GraphicImageRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>label</tag-name> - <component> - <component-type>org.jboss.seam.ui.Label</component-type> - </component> - </tag> - <tag> - <tag-name>link</tag-name> - <component> - <component-type>org.jboss.seam.ui.Link</component-type> - <renderer-type>org.jboss.seam.ui.LinkRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>loadStyle</tag-name> - <component> - <component-type>org.jboss.seam.ui.LoadStyle</component-type> - </component> - </tag> - <tag> - <tag-name>message</tag-name> - <component> - <component-type>org.jboss.seam.ui.Message</component-type> - </component> - </tag> - <tag> - <tag-name>selectDate</tag-name> - <component> - <component-type>org.jboss.seam.ui.SelectDate</component-type> - <renderer-type>org.jboss.seam.ui.SelectDateRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>selection</tag-name> - <component> - <component-type>org.jboss.seam.ui.Selection</component-type> - </component> - </tag> - <tag> - <tag-name>selectItems</tag-name> - <component> - <component-type>org.jboss.seam.ui.SelectItems</component-type> - </component> - </tag> - <tag> - <tag-name>span</tag-name> - <component> - <component-type>org.jboss.seam.ui.Span</component-type> - <renderer-type>org.jboss.seam.ui.SpanRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>taskId</tag-name> - <component> - <component-type>org.jboss.seam.ui.TaskId</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageBlur</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageBlur</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageSize</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageSize</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageType</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageType</component-type> - </component> - </tag> - <tag> - <tag-name>validateAll</tag-name> - <component> - <component-type>org.jboss.seam.ui.ValidateAll</component-type> - <renderer-type>org.jboss.seam.ui.ValidateAllRenderer</renderer-type> - </component> - </tag> - - <tag> - <tag-name>validate</tag-name> - <validator> - <validator-id>org.jboss.seam.ui.ModelValidator</validator-id> - </validator> - </tag> - - <tag> - <tag-name>convertDateTime</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.DateTimeConverter</converter-id> - </converter> - </tag> - <tag> - <tag-name>convertEntity</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.EntityConverter</converter-id> - </converter> - </tag> - <tag> - <tag-name>convertEnum</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.EnumConverter</converter-id> - </converter> - </tag> - - - -</facelet-taglib> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class =================================================================== (Binary files differ) Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:web="http://jboss.org/schema/seam/web" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/web http://jboss.org/schema/seam/web-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:init debug="true"/> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true" - session-factory-jndi-name="bookingDatabase"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -  - <web:ajax4jsf-filter disabled="true" /> -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.5" - 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"> - -  - <filter> - <display-name>RichFaces Filter</display-name> - <filter-name>richfaces</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - - <filter-mapping> - <filter-name>richfaces</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - -  - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,20 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">DefaultDatasource</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">GlassfishDerbyDialect</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.WebSphereTransactionManagerLookup</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Lopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties =================================================================== Modified: branches/enterprise/WFK-2_0/examples-ee6/hibernate/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,10 +2,8 @@ ====================== This is the Hotel Booking example implemented in Seam and Hibernate POJOs. -This application runs on JBoss AS 4.2, 5 and 6, Tomcat with JBoss Embedded -and Glassfish V2. -To deploy the example to JBossAS 5 or 6, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -15,16 +13,6 @@ * In the hibernate-web directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy -The following is a list of profiles which you should use to build the -application for various application servers. - -JBoss AS 4.2 -> -Pjbossas42 (i.e. mvn clean package -Pjbossas42) -Glassfish V2 -> -Pglassfish2 -Tomcat with JBoss Embedded -> -Ptomcat - -Furthermore, when you're targeting a different application server than -JBossAS 5 or 6, you have to deploy the application manually. - * Open this URL in a web browser: http://localhost:8080/jboss-seam-hibernate Modified: branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -133,14 +133,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -175,28 +167,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-itext</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/enterprise/WFK-2_0/examples-ee6/itext/itext-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/itext/itext-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/itext/itext-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -102,89 +102,5 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>java:app/itext-ejb/#{ejbName}</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.itext</groupId> - <artifactId>itext-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </dependency> - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext-rtf</artifactId> - </dependency> - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - </dependencies> - <build> - <finalName>jboss-seam-itext</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/itext/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/itext/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/itext/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam iText Example ================== -This example demonstrates the Seam PDF functionality. It runs on JBoss AS as an -EAR and Tomcat with Embedded JBoss as a WAR. +This example demonstrates the Seam PDF functionality. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +13,7 @@ * In the itext-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-itext -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting WAR from itext-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-itext Modified: branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -145,14 +145,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -187,27 +179,5 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-jpa</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/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -102,356 +102,7 @@ </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> - <profiles> - <profile> - <id>jbossas7</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.as.plugins</groupId> - <artifactId>jboss-as-maven-plugin</artifactId> - <version>7.0.2.Final</version> - <configuration> - <filename>${project.build.finalName}.war</filename> - </configuration> - </plugin> - </plugins> - </build> - <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.jpa</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>org.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> - </profile> - <profile> - <id>jbossas51</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <properties> - <loadPersistenceUnits>true</loadPersistenceUnits> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </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> - </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.jpa</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>org.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>org.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> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-jboss405.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-jboss405.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-jboss405.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for JBoss 4.0.5"/> - <property name="example.name" value="jboss-seam-jpa"/> - -  - <property name="resources.dir" value="resources-jboss" /> - <property name="dist.dir" value="dist-jboss405" /> - <property name="exploded-archives.dir" value="exploded-archives-jboss405" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jsf-api.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar"/> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat55.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat55.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat55.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,64 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for plain Tomcat 5.5"/> - <property name="example.name" value="jboss-seam-jpa"/> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat55" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar"/> - -  - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/jta.jar"/> - -  - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/asm.jar" /> - <include name="lib/cglib.jar"/> - <include name="lib/antlr.jar" /> - </fileset> - - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - <include name="WEB-INF/classes/log4j.xml" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat6.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat6.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-tomcat6.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,55 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for plain Tomcat 6.0"/> - <property name="example.name" value="jboss-seam-jpa"/> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat6" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat6" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/log4j.jar"/> - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/dom4j.jar" /> - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/javassist.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/jta.jar" /> - <include name="lib/antlr.jar" /> - <include name="lib/asm.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - <include name="WEB-INF/classes/log4j.xml" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic10.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic10.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic10.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,54 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for WebLogic 10" /> - <property name="example.name" value="jboss-seam-jpa" /> - -  - <property name="resources.dir" value="resources-weblogic10" /> - <property name="dist.dir" value="dist-weblogic10" /> - <property name="exploded-archives.dir" - value="exploded-archives-weblogic10" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar" /> - -  - <include name="lib/commons-beanutils.jar" /> - <include name="lib/commons-digester.jar" /> - <include name="lib/commons-collections.jar" /> - <include name="lib/commons-logging.jar" /> - -  - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/asm.jar"/> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic92.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic92.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-weblogic92.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,61 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for WebLogic 9.2" /> - <property name="example.name" value="jboss-seam-jpa" /> - -  - <property name="resources.dir" value="resources-weblogic92" /> - <property name="dist.dir" value="dist-weblogic92" /> - <property name="exploded-archives.dir" - value="exploded-archives-weblogic92" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar" /> - -  - <include name="lib/jta.jar" /> - <include name="lib/commons-beanutils.jar" /> - <include name="lib/commons-digester.jar" /> - <include name="lib/commons-collections.jar" /> - <include name="lib/commons-logging.jar" /> - -  - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere61.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere61.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere61.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,56 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for WebSphere 6.1.0.13 + EJB3 FP"/> - <property name="example.name" value="jboss-seam-jpa"/> - -  - <property name="resources.dir" value="resources-websphere61" /> - <property name="dist.dir" value="dist-websphere61" /> - <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar"/> - -  - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-collections.jar"/> -  - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/cglib.jar"/> - <include name="lib/asm.jar"/> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere7.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere7.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/build-websphere7.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,51 +0,0 @@ -<?xml version="1.0"?> - -<project name="JPA Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The JPA Example for WebSphere 7" /> - <property name="example.name" value="jboss-seam-jpa" /> - -  - <property name="resources.dir" value="resources-websphere7" /> - <property name="dist.dir" value="dist-websphere7" /> - <property name="exploded-archives.dir" value="exploded-archives-websphere7" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar" /> - -  - <include name="lib/commons-beanutils.jar" /> - <include name="lib/commons-digester.jar" /> - <include name="lib/commons-collections.jar" /> - <include name="lib/log4j.jar" /> - -  - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/antlr.jar" /> - - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,93 +0,0 @@ -Seam JPA Example -================ - -This is the Hotel Booking example implemented in Seam POJO and Hibernate JPA. -It can be deployed in JBoss AS 4.x, WebLogic, GlassFish, Tomcat (both with and -without the EJB3 container). - -JBoss AS 4.2.0: - * Install JBoss AS 4.2.0 GA - * ant jboss - * Start JBoss AS - * Access the app at http://localhost:8080/jboss-seam-jpa/ - * ant jboss.undeploy - -JBoss AS 4.0.5 (with or without EJB3): - * Install JBoss AS 4.0.5 with the default J2EE profile - * ant jboss405 - * Deploy dist-jboss405/jboss-seam-jpa.war - * Start JBoss AS - * Access the app at http://localhost:8080/jboss-seam-jpa/ - -WebLogic 9.2: - * Install WebLogic 9.2 - * ant weblogic92 - * Start the WebLogic "examples" server - * Load the admin console http://localhost:7001/console/ - * Deploy dist-weblogic92/jboss-seam-jpa.war - * Access the app at http://localhost:7001/jboss-seam-jpa/ - -WebLogic 10.X: - * Install WebLogic 10.X - * Create an hsql datasource called 'seam-jpa-ds" (see reference guide) - * Deploy Weblogics jsf-1.2.war shared library for JSF 1.2 support. (see reference guide) - * ant weblogic10 - * Start the WebLogic domain you created or the "examples" domain if installed. - * Load the admin console http://localhost:7001/console/ - * Deploy dist-weblogic10/jboss-seam-jpa.war - * Access the app at http://localhost:7001/jboss-seam-jpa/ - * See Weblogic reference guide chapter for full details. - -WebSphere 6.1: - * Install and run WebSphere 6.1 - * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application - * Set a Websphere web container custom property "com.ibm.ws.webcontainer.invokefilterscompatibility" to true. See Seam reference guide chapter for details. - * Set a Websphere web container custom property "prependSlashToResource" to true. See Seam reference guide chapter for details. - * ant websphere61 - * Deploy dist-websphere61/jboss-seam-jpa.war and specify a context_root - * From the "Enterprise Applications" list select: "jboss-seam-jpa" --> "Manager Modules" --> "jboss-seam-jpa.war" --> "Classes loaded with application class loader first", and then Apply - * Start the application - * Access it at http://localhost:9080/context_root/index.html - -WebSphere 7.0: - * Install and run WebSphere 7.0 - * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application - * ant websphere7 - * Deploy dist-websphere7/jboss-seam-jpa.war and specify a context_root (choose the "fast path" and keep all the defaults) - * Start the application - * Access it at http://localhost:9080/<context_root> - -Tomcat with JBoss Embedded: - * Install Tomcat - * Install JBoss Embedded - * ant jboss-embedded - * Deploy dist-jboss-embedded/jboss-seam-jpa.war - * Start Tomcat - * Access the app at http://localhost:8080/jboss-seam-jpa/ - -Tomcat (5.5 or 6) without JBoss Embedded: - * Install Tomcat - * Copy lib/hsqldb.jar from this distribution into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6) - * ant tomcat55 or ant tomcat6 - * Deploy dist-jboss/jboss-seam-jpa.war - * Start Tomcat - * Access the app at http://localhost:8080/jboss-seam-jpa/ - -GlassFish: - * Install GlassFish V2 - * ant glassfish - * Start GlassFish and the Embedded Derby Database - * Load the admin console http://localhost:4848/ - * Deploy dist-glassfish/jboss-seam-jpa.war in the admin console (Applications > Web Applications) - or using the command $GLASSFISH_HOME/bin/asadmin deploy dist-glassfish/jboss-seam-jpa.war - * Access the app at http://localhost:8080/jboss-seam-jpa/ - -NOTES FOR GLASSFISH USERS: - In order for the app to work out of the box with GlassFish, we have - used the Derby (i.e., Java DB) database in GlassFish. The included - WEB-INF/classes/GlassfishDerbyDialect.class is a special hack to get - around a Derby bug in GlassFish V2. You must use it as your Hibernate - dialect if you use Derby with GlassFish. - - However, we strongly recommend you to use a non-Derby data source if - possible (for example, HSQL is a much better embedded DB). Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,9 +0,0 @@ -<Context path="/jboss-seam-jpa" docBase="jboss-seam-jpa" - debug="5" reloadable="true" crossContext="true"> - - <Resource name="jdbc/TestDB" auth="Container" type="javax.sql.DataSource" - maxActive="100" maxIdle="30" maxWait="10000" - username="sa" driverClassName="org.hsqldb.jdbcDriver" - url="jdbc:hsqldb:."/> - -</Context> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:comp/env/jdbc/TestDB</jta-data-source> - <properties> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> -  -  - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> -  - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:transaction="http://jboss.org/schema/seam/transaction" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/transaction http://jboss.org/schema/seam/transaction-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <transaction:entity-transaction entity-manager="#{em}"/> - - <persistence:entity-manager-factory name="bookingDatabase"/> - - <persistence:managed-persistence-context name="em" - auto-create="true" - entity-manager-factory="#{bookingDatabase}"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - 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"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-tomcat/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>seam-jpa-ds</jta-data-source> - <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WeblogicTransactionManagerLookup"/> - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:transaction="http://jboss.org/schema/seam/transaction" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/transaction http://jboss.org/schema/seam/transaction-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <transaction:entity-transaction entity-manager="#{em}"/> - - <persistence:entity-manager-factory name="bookingDatabase" /> - - <persistence:managed-persistence-context name="em" - auto-create="true" - entity-manager-factory="#{bookingDatabase}" /> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - 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"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<weblogic-web-app xmlns="http://www.bea.com/ns/weblogic/90" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd"> - <library-ref> - <library-name>jsf</library-name> - <specification-version>1.2</specification-version> - <implementation-version>1.2</implementation-version> - <exact-match>false</exact-match> - </library-ref> - <container-descriptor> - <prefer-web-inf-classes>true</prefer-web-inf-classes> - </container-descriptor> -</weblogic-web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic10/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence> - <persistence-unit name="bookingDatabase" transaction-type="JTA"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>examples-dataSource-demoPool</jta-data-source> - <properties> - <property name="hibernate.dialect" - value="org.hibernate.dialect.PointbaseDialect"/> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WeblogicTransactionManagerLookup"/> -  - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:transaction="http://jboss.org/schema/seam/transaction" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:entity-manager-factory name="bookingDatabase"/> - - <persistence:managed-persistence-context name="em" - auto-create="true" - entity-manager-factory="#{bookingDatabase}"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-weblogic92/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>DefaultDatasource</jta-data-source> - <properties> -  - <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/> - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:transaction="http://jboss.org/schema/seam/transaction" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:web="http://jboss.org/schema/seam/web" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/transaction http://jboss.org/schema/seam/transaction-2.3.xsd - http://jboss.org/schema/seam/web http://jboss.org/schema/seam/web-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <transaction:entity-transaction entity-manager="#{em}"/> - - <persistence:entity-manager-factory name="bookingDatabase"/> - - <persistence:managed-persistence-context name="em" auto-create="true" - entity-manager-factory="#{bookingDatabase}"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" -xmlns="http://java.sun.com/xml/ns/j2ee" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee -http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Leopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere61/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - - <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> - - <provider>org.hibernate.ejb.HibernatePersistence</provider> - - <jta-data-source>DefaultDatasource</jta-data-source> - - <properties> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/> - -  - <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> - - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - - - <category name="org.jboss.seam"> - <priority value="DEBUG"/> - </category> - - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.org/schema/seam/components" - xmlns:core="http://jboss.org/schema/seam/core" - xmlns:persistence="http://jboss.org/schema/seam/persistence" - xmlns:transaction="http://jboss.org/schema/seam/transaction" - xmlns:security="http://jboss.org/schema/seam/security" - xmlns:web="http://jboss.org/schema/seam/web" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd - http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd - http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd - http://jboss.org/schema/seam/transaction http://jboss.org/schema/seam/transaction-2.3.xsd - http://jboss.org/schema/seam/web http://jboss.org/schema/seam/web-2.3.xsd - http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <transaction:entity-transaction entity-manager="#{em}"/> - - <persistence:entity-manager-factory name="bookingDatabase"/> - - <persistence:managed-persistence-context name="em" auto-create="true" - entity-manager-factory="#{bookingDatabase}"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - 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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.org/schema/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - 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"> - - <display-name>Seam POJO Booking Example</display-name> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -  - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Leopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/enterprise/WFK-2_0/examples-ee6/jpa/other-configurations/resources-websphere7/seam.properties =================================================================== Modified: branches/enterprise/WFK-2_0/examples-ee6/jpa/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,10 +2,8 @@ ================ This is the Hotel Booking example implemented in Seam POJO and Hibernate JPA. -This application runs on JBoss AS 4.2, 5 and 6, Tomcat with JBoss Embedded -and Glassfish V2. -To deploy the example to JBossAS 5 or 6, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -15,16 +13,6 @@ * In the jpa-web directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy -The following is a list of profiles which you should use to build the -application for various application servers. - -JBoss AS 4.2 -> -Pjbossas42 (i.e. mvn clean package -Pjbossas42) -Glassfish V2 -> -Pglassfish2 -Tomcat with JBoss Embedded -> -Ptomcat - -Furthermore, when you're targeting a different application server than -JBossAS 5 or 6, you have to deploy the application manually. - * Open this URL in a web browser: http://localhost:8080/jboss-seam-jpa Modified: branches/enterprise/WFK-2_0/examples-ee6/mail/mail-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/mail/mail-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/mail/mail-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -146,14 +146,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -188,28 +180,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-mail</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/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -117,65 +117,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.mail</groupId> - <artifactId>mail-ejb</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</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> - </dependencies> - <build> - <finalName>jboss-seam-mail</finalName> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../mail-ear/src/main/resources</directory> - <includes> - <include>jboss-seam-mail-ds.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/mail/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/mail/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/mail/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +1,7 @@ Seam Mail Example ================== -This example demonstrates the Seam Mail functionality. It runs on JBoss AS as +This example demonstrates the Seam Mail functionality. It runs on AS as an EAR. example.name=mail Modified: branches/enterprise/WFK-2_0/examples-ee6/messages/messages-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/messages/messages-ear/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/messages/messages-ear/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -13,11 +13,6 @@ <packaging>ear</packaging> <name>Messages 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.messages</groupId> @@ -70,39 +65,6 @@ </modules> </configuration> </plugin> - <plugin> - <groupId>org.jboss.as.plugins</groupId> - <artifactId>jboss-as-maven-plugin</artifactId> - <executions> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <execution> - <phase></phase> - <goals> - <goal>deploy</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -149,17 +111,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <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> Modified: branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -111,14 +111,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -140,17 +132,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}/../messages-ear/target/seam-messages.ear</param> - </fileNames> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> @@ -164,28 +145,6 @@ </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/enterprise/WFK-2_0/examples-ee6/messages/messages-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/messages/messages-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/messages/messages-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -72,52 +72,5 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>messages-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-messages</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/messages/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/messages/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/messages/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,7 +2,6 @@ ========================= This is a simple example of the use of @DataModel for the Seam tutorial. -It runs on JBoss AS as an EAR and Tomcat with Embedded JBoss as a WAR. To deploy the example to JBossAS 5, follow these steps: @@ -14,17 +13,7 @@ * In the messages-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-messages -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting WAR from messages-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-messages - Modified: branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -4,7 +4,7 @@ This example demonstrates the use of Seam nested conversations and runs on JBoss AS as an EAR. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,7 +14,7 @@ * In the nestedbooking-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-nestedbooking Modified: branches/enterprise/WFK-2_0/examples-ee6/openid/openid-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/openid/openid-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/openid/openid-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -86,53 +86,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.openid</groupId> - <artifactId>openid-ejb</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <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-openid</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/openid/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/openid/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/openid/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,9 +2,8 @@ =================== This is a trivial example of presentation how OpenId authentication is integrated with Seam security. -It runs on both JBoss AS as an EAR and Tomcat with Embedded JBoss as a WAR. -To deploy the example to JBossAS 4, JBossAS 5 or JBossAS 6, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +13,7 @@ * In the openid-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-openid -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from openid-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-openid Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -60,7 +60,6 @@ <module>remoting/chatroom</module> <module>remoting/gwt</module> <module>remoting/helloworld</module> - <module>remoting/progressbar</module> <module>restbay</module> <module>seambay</module> <module>seamdiscs</module> @@ -514,217 +513,6 @@ </build> </profile> <profile> - <id>ftest-tomcat</id> - <properties> - <testng.suite>testng.xml</testng.suite> - <container>jboss5</container> - </properties> - <dependencies> - <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> - <artifactId>selenium-server</artifactId> - <classifier>standalone</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - <executions> - <execution> - <id>start-selenium</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-server</goal> - </goals> - <configuration> - <background>true</background> - <port>${selenium.server.port}</port> - <logOutput>true</logOutput> - <logFile>${selenium.log.dir}/selenium-server.log</logFile> - <browserSideLog>${selenium.debug}</browserSideLog> - <debug>${selenium.debug}</debug> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile> - </suiteXmlFiles> - <argLine>-Xmx748m</argLine> - <forkMode>once</forkMode> - <properties> - <property> - <name>listener</name> - <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value> - </property> - </properties> - <systemProperties> - <property> - <name>selenium.browser</name> - <value>${selenium.browser}</value> - </property> - <property> - <name>selenium.browser.url</name> - <value>${selenium.browser.url}</value> - </property> - <property> - <name>example.context.path</name> - <value>${example.context.path}</value> - </property> - <property> - <name>selenium.host</name> - <value>${selenium.server.host}</value> - </property> - <property> - <name>selenium.server.port</name> - <value>${selenium.server.port}</value> - </property> - <property> - <name>selenium.speed</name> - <value>${selenium.speed}</value> - </property> - <property> - <name>selenium.timeout</name> - <value>${selenium.timeout}</value> - </property> - <property> - <name>selenium.output.dir</name> - <value>${selenium.output.dir}</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>container</name> - <value>${container}</value> - </property> - <property> - <name>openid.account</name> - <value>${openid.account}</value> - </property> - <property> - <name>openid.password</name> - <value>${openid.password}</value> - </property> -  - <property> - <name>browser</name> - <value>${selenium.browser}</value> - </property> - <property> - <name>server.url</name> - <value>${selenium.browser.url}</value> - </property> - <property> - <name>context.path</name> - <value>${example.context.path}</value> - </property> - </systemProperties> - </configuration> - <executions> - <execution> - <id>verify</id> - <phase>verify</phase> - <goals> - <goal>verify</goal> - </goals> - </execution> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>deploy-application</id> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - <fail unless="catalina.home" message="CATALINA_HOME environment property was not set" /> - <copy file="${basedir}/../${example.name}-web/target/${example.context.path}.war" todir="${catalina.home}/webapps" overwrite="true" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>wait-for-application</id> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - <echo message="Waiting for ${selenium.browser.url}/${example.context.path}" /> - <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000"> - <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404" /> - </waitfor> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>stop-selenium</id> - <phase>post-integration-test</phase> - <configuration> - <tasks> - <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" /> - <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>undeploy-application</id> - <phase>post-integration-test</phase> - <configuration> - <tasks> - <delete file="${catalina.home}/webapps/${example.context.path}.war" failonerror="false" /> - <delete dir="${catalina.home}/webapps/${example.context.path}" failonerror="false" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - <profile> <id>ftest-jbossas-cluster</id> <properties> <testng.suite>testng-cluster.xml</testng.suite> Modified: branches/enterprise/WFK-2_0/examples-ee6/quartz/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/quartz/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/quartz/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,8 +1,7 @@ Seam Quartz Example =================== -This example demonstrates the Seam Quartz Timer functionality. It runs on JBoss -AS as an EAR. +This example demonstrates the Seam Quartz Timer functionality. To deploy the example to JBoss AS, follow these steps: @@ -14,6 +13,6 @@ * In the quartz-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-quartz Modified: branches/enterprise/WFK-2_0/examples-ee6/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -68,39 +68,33 @@ NOTE: The examples use the H2 database embedded in JBoss AS -Running The TestNG Tests +Running The Integration Tests ------------------------ -TestNG tests are executed during building of the application using: +Integration tests are executed during building of the application using: - mvn clean package -P<maven_profile> + mvn clean package -Darquillian=jbossas-{managed,remote}-7 -TODO: Running the TestNG Tests in Eclipse +Running integration test(s) in Eclipse +------------------------ +Detail guide is at http://docs.jboss.org/arquillian/reference/1.0.0.Alpha1/en-US/html_single... + +Debugging of integration test(s) in Eclipse +----------------------- +http://docs.jboss.org/arquillian/reference/1.0.0.Alpha1/en-US/html_single/#d0e974 + + Running functional tests on an example ======================================= The following steps describe executing of functional tests in general. If particular example does not contain certain profile, it is simply ignored during the maven call. -* Start JBoss AS 4, 5, 6 or Tomcat -* Set JBOSS_HOME or CATALINA_HOME environment property, respectively +* Start JBoss AS 7 +* Set JBOSS_HOME environment property, respectively -To run functional tests on JBoss AS 4.2: +To run functional tests: -* mvn clean verify -Pjbossas42,ftest-jbossas - -To run functional tests on JBoss AS 5.1: - -* mvn clean verify -Pjbossas51,ftest-jbossas - -To run functional tests on JBoss AS 6: - -* mvn clean verify -Pjbossas6,ftest-jbossas - -To run functional tests on Tomcat with Embedded JBoss: - -* mvn clean verify -Ptomcat,ftest-tomcat - - +* mvn clean verify -Pftest-jbossas Modified: branches/enterprise/WFK-2_0/examples-ee6/registration/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/registration/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/registration/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam Registration Example ========================= -This is a trivial example for the Seam tutorial. It runs on both JBoss AS as an -EAR and Tomcat with Embedded JBoss as a WAR. +This is a trivial example for the Seam tutorial. -To deploy the example to JBossAS 4, JBossAS 5 or JBossAS 6, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +13,7 @@ * In the registration-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-registration -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from registration-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-registration Modified: branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - </dependency> <dependency> <groupId>org.jboss.seam.examples.registration</groupId> @@ -117,14 +116,6 @@ <value>jbossas-managed-7</value> </property> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> </profile> <profile> @@ -159,28 +150,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-registration</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/enterprise/WFK-2_0/examples-ee6/registration/registration-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/registration/registration-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/registration/registration-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -74,50 +74,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-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-registration</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,14 +2,9 @@ ===================== This example shows using Seam Remoting to subscribe and publish messages to JMS. -It runs on JBoss AS as an EAR. -NOTE: -JBoss AS 6 has got new default JMS provider Hornetq, which requires different JMS -configuration. JBoss AS 5 can have also Hornetq instead of default JBoss Messaging. +To deploy the example, follow these steps: -To deploy the example to JBossAS, follow these steps: - * In the example root directory run: mvn clean package @@ -18,16 +13,11 @@ * In the chatroom-ear directory run: - mvn jboss:hard-deploy (when intending to use JBoss Messaging) + mvn jboss-as:deploy - mvn jboss:hard-deploy -Phornetq (when intending to use HornetQ) - * Open this URL in a web browser: http://localhost:8080/seam-chatroom -To run functional tests for the example on JBoss AS 5 or 6, run: +To run functional tests for the example, run: - mvn verify -Pftest-jbossas (add a hornetq profile when intending to use HornetQ) + mvn verify -Pftest-jbossas -To run functional tests for the example on JBoss AS 4, run: - - mvn verify -Pftest-jbossas -Djbossas.version=4 Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,9 +2,8 @@ ========================= This example shows GWT with Seam remoting. -It runs on JBoss AS as an EAR. -To deploy the example to JBossAS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,7 +13,7 @@ * In the gwt-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-gwt Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> @@ -68,28 +67,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>/jboss-seam-helloworld</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/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -63,48 +63,5 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>tomcat</id> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.remoting.helloworld</groupId> - <artifactId>helloworld-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-helloworld</finalName> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam Remoting/Helloworld Example ================================ -This example is a trivial example of Seam Remoting. It runs on JBoss AS as an -EAR and on Tomcat with JBoss Embedded as a WAR. +This example is a trivial example of Seam Remoting. -To deploy the example to JBossAS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +13,7 @@ * In the helloworld-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-helloworld -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from helloworld-web/target directory to Tomcat manually - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-helloworld Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,48 +0,0 @@ -<?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"> - <parent> - <artifactId>examples</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta2-redhat-1</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples.remoting</groupId> - <artifactId>progressbar</artifactId> - <packaging>pom</packaging> - <name>Progressbar Example (EE6)</name> - - <modules> - <module>progressbar-ejb</module> - <module>progressbar-web</module> - <module>progressbar-ear</module> - </modules> - - <properties> - <example.name>progressbar</example.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - -</project> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,122 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>progressbar</artifactId> - <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0.Beta2-redhat-1</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ear</artifactId> - <packaging>ear</packaging> - <name>Progressbar EAR Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-web</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <finalName>seam-progressbar</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <version>6</version> - <defaultLibBundleDir>lib</defaultLibBundleDir> -  - <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> -  - <generateApplicationXml>true</generateApplicationXml> - <filtering>true</filtering> - <modules> - <webModule> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-web</artifactId> - <contextRoot>/seam-progressbar</contextRoot> - <bundleFileName>progressbar-web.war</bundleFileName> - </webModule> - <ejbModule> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <bundleFileName>progressbar-ejb.jar</bundleFileName> - </ejbModule> - <ejbModule> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <bundleFileName>jboss-seam.jar</bundleFileName> - </ejbModule> - </modules> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>exploded</id> - <properties> - <example.name>progressbar</example.name> - </properties> - <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.remoting.progressbar</groupId> - <artifactId>progressbar-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.remoting.progressbar</groupId> - <artifactId>progressbar-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.remoting.progressbar</groupId> - <artifactId>progressbar-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> - </plugins> - </build> - </profile> - </profiles> -</project> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,11 +0,0 @@ -<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> - <deployment> - <dependencies> - <module name="org.apache.log4j" 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> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,43 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>progressbar</artifactId> - <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0.Beta2-redhat-1</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <packaging>ejb</packaging> - <name>Progressbar EJB Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</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.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-remoting</artifactId> - </dependency> - </dependencies> - -</project> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/Progress.java =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/Progress.java 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/Progress.java 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,39 +0,0 @@ -package org.jboss.seam.example.remoting; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -/** - * Contains progress information. - * - * @author Shane Bryzak - * @version 1.0 - */ -@Name("progress") -(a)Scope(ScopeType.SESSION) -public class Progress { - - private int percentComplete; - private String status; - - public int getPercentComplete() - { - return percentComplete; - } - - public void setPercentComplete(int percentComplete) - { - this.percentComplete = percentComplete; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } -} Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarAction.java =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarAction.java 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarAction.java 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,37 +0,0 @@ -package org.jboss.seam.example.remoting; - -import java.util.Random; - -import javax.ejb.Stateless; - -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; - -@Stateless -@Name("progressBarAction") -public class ProgressBarAction implements ProgressBarLocal { - - @In(create = true) - Progress progress; - - public String doSomething() { - Random r = new Random(System.currentTimeMillis()); - try { - for (int i = 1; i <= 100;) - { - Thread.sleep(r.nextInt(200)); - progress.setPercentComplete(i); - i++; - } - } - catch (InterruptedException ex) { - } - - return "/complete.xhtml"; - } - - public Progress getProgress() - { - return progress; - } -} Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarLocal.java =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarLocal.java 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/java/org/jboss/seam/example/remoting/ProgressBarLocal.java 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,12 +0,0 @@ -package org.jboss.seam.example.remoting; - -import javax.ejb.Local; - -import org.jboss.seam.annotations.remoting.WebRemote; - -@Local -public interface ProgressBarLocal { - String doSomething(); - @WebRemote Progress getProgress(); -} - Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/META-INF/ejb-jar.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/META-INF/ejb-jar.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ejb-jar 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/ejb-jar_3_0.xsd" - version="3.0"> - - <interceptors> - <interceptor> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor> - </interceptors> - - <assembly-descriptor> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> - -</ejb-jar> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/src/main/resources/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,99 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>progressbar</artifactId> - <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0.Beta2-redhat-1</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-web</artifactId> - <packaging>war</packaging> - <name>Progressbar Web Module (EE6)</name> - - <properties> -  - <jndiPattern>java:app/progressbar-ejb/#{ejbName}</jndiPattern> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <type>ejb</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>tomcat</id> - <properties> - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.remoting.progressbar</groupId> - <artifactId>progressbar-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-progressbar</finalName> - </build> - </profile> - </profiles> - -</project> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/components.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/components.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,11 +0,0 @@ -<components xmlns="http://jboss.org/schema/seam/components"> - - <component name="org.jboss.seam.core.init"> - <property name="jndiPattern">@jndiPattern@</property> - </component> - - <component name="org.jboss.seam.core.manager"> - <property name="conversationTimeout">120000</property> - </component> - -</components> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/faces-config.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/faces-config.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - -</faces-config> Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/web.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/WEB-INF/web.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<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.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -</web-app> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/complete.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/complete.xhtml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/complete.xhtml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,17 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> - -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>Seam Remoting Framework</title> -</head> - -<body> - - <h1>Action complete</h1> - -</body> -</html> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/index.html =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/index.html 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/index.html 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=progressbar.seam"> -</head> -</html> \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/progressbar.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/progressbar.xhtml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/progressbar.xhtml 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,96 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> - -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>Seam Remoting Progress Bar Example</title> - - <style> - - div.slider-box - { - position: relative; - width: 200px; - height: 20px; - border: 1px solid #cccccc; - background-color: white; - color: white; - margin-bottom: 4px; - } - - div.slider-progress - { - color: black; - font-family: helvetica; - font-size: 9pt; - padding: 2px; - font-weight: bold; - } - - </style> -</head> - -<body> - - <script type="text/javascript" src="seam/resource/remoting/resource/remote.js"></script> - <script type="text/javascript" src="seam/resource/remoting/interface.js?progressBarAction"></script> - <script type="text/javascript" src="slider.js"></script> - - <script type="text/javascript"> - //<![CDATA[ - - // don't display the loading indicator - Seam.Remoting.displayLoadingMessage = function() {}; - Seam.Remoting.hideLoadingMessage = function() {}; - - var progressBarAction = Seam.Component.getInstance("progressBarAction"); - - function queryProgress() { - setTimeout("getProgress()", 250); - } - - function getProgress() { - progressBarAction.getProgress(progressCallback); - } - - function progressCallback(progress) { - progressBar.setPosition(progress.percentComplete); - if (progress.percentComplete < 100) - queryProgress(); - } - - // ]]> - </script> - - <h1>Seam Progress Bar Demo</h1> - - <p>This small example demonstrates how to implement a progress bar for long-running actions, using Seam Remoting.</p> - - <h:form onsubmit="queryProgress();return true;"> - - <h:commandButton style="width:80px" value="Go!" action="#{progressBarAction.doSomething}" styleClass="button"/> - - </h:form> - - <div id="progressBar"></div> - - <script type="text/javascript"> - //<![CDATA[ - - var progressBar = qfSliderFactory.addSlider("progressBar"); - progressBar.setMaxValue(100); - progressBar.setWidth(200); - progressBar.setClassName("slider-box"); - progressBar.setUsedColour("#0000cf"); - progressBar.setShowProgress(true); - progressBar.setProgressClassName("slider-progress"); - progressBar.repaint(); - - // ]]> - </script> - -</body> -</html> - Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/slider.js =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/slider.js 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-web/src/main/webapp/slider.js 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,635 +0,0 @@ -function getObject(objectId) -{ - if (document.getElementById && document.getElementById(objectId)) - return document.getElementById(objectId); - else if (document.all && document.all(objectId)) - return document.all(objectId); - else if (document.layers && document.layers[objectId]) - return document.layers[objectId]; - else - return null; -}; - -function getStyleObject(objectId) -{ - if(document.getElementById && document.getElementById(objectId)) - return document.getElementById(objectId).style; - else if (document.all && document.all(objectId)) - return document.all(objectId).style; - else if (document.layers && document.layers[objectId]) - return document.layers[objectId]; - else - return null; -}; - -// Returns the location and dimensions of a control -function __getControlDim(ctl) -{ - var width = ctl.offsetWidth; - var height = ctl.offsetHeight; - for (var lx = 0, ly = 0; ctl != null; lx += ctl.offsetLeft, ly += ctl.offsetTop, ctl = ctl.offsetParent); - return {x:lx, y:ly, width:width, height:height}; -}; - -function inverseRGB(rgbString) -{ - if (!rgbString || (rgbString = "")) - rgbString = "rgb(0,0,0)"; - - var elts = rgbString.slice(4, rgbString.length - 1).split(","); - return "rgb(" + (255 - elts[0]) + "," + (255 - elts[1]) + "," + (255 - elts[2]) + ")"; -}; - -function __TagAttribute(name, value) -{ - this.name = name; - this.value = value; -}; - -function __Tag(name) -{ - this.name = name; - this.attributes = new Array(); - this.childTags = new Array(); - this.text = ""; - - __Tag.prototype.addChildTag = function(name) - { - var childTag = new __Tag(name); - this.appendChild(childTag); - return childTag; - }; - - __Tag.prototype.appendChild = function(childTag) - { - this.childTags[this.childTags.length] = childTag; - }; - - __Tag.prototype.setAttribute = function(name, value) - { - this.attributes[this.attributes.length] = new __TagAttribute(name, value); - }; - - __Tag.prototype.setText = function(text) - { - this.text = text; - }; - - __Tag.prototype.getHTML = function() - { - var html = "<" + this.name; - for (var i = 0; i < this.attributes.length; i++) - { - var tagAttribute = this.attributes[i]; - html += " " + tagAttribute.name + "=\"" + tagAttribute.value + "\""; - } - html += ">" + this.text; - - for (var i = 0; i < this.childTags.length; i++) - { - html += this.childTags[i].getHTML(); - } - - html += "</" + this.name + ">"; - return html; - }; -}; - -function __SliderFactory() -{ - this.sliders = new Array(); - - __SliderFactory.prototype.addSlider = function (divId) - { - var slider = new __Slider(divId); - this.sliders[this.sliders.length] = slider; - return slider; - }; - - __SliderFactory.prototype.getSliderByName = function (name) - { - for (var i = 0; i < this.sliders.length; i++) - { - if (this.sliders[i].sliderName == name) - return this.sliders[i]; - } - return null; - }; -} - - -function qfSliderLimits(top, right, bottom, left) -{ - this.top = top; - this.right = right; - this.bottom = bottom; - this.left = left; -} - -// TODO percentage indicator -// TODO verticial (bottom to top) -// TODO reverse painting Top to Bottom -// TODO snap to closest value (multiple of abs(step)) - -var qfSlider_VERTICAL = "vertical"; -var qfSlider_HORIZONTAL = "horizontal"; - -function __Slider(divId) -{ - this.sliderName = divId; - this.divId = "__" + divId; - this.divCtl = getObject(divId); - this.width = 0; - this.height = 0; - this.minValue = 0; - this.maxValue = 0; - this.position = 0; - this.stepAmt = 1; - this.horizontal = true; - this.onChange = null; - this.className = ""; - this.thumbClassName = ""; - this.showProgress = false; - this.progressClassName = ""; - this.reversePaint = false; - - this.showThumb = false; - this.thumbLimits = new qfSliderLimits(0, 0, 0, 0); - - this.showUsed = true; - this.usedLimits = new qfSliderLimits(0, 0, 0, 0); - this.usedColour = "navy"; - this.usedClassName = ""; - - this.showRemain = false; - this.remainLimits = new qfSliderLimits(0, 0, 0, 0); - this.remainColour = "white"; - this.remainClassName = ""; - - this.innerDivId = this.divId + "_inner"; - this.thumbDivId = this.divId + "_thumb"; - this.usedDivId = this.divId + "_used"; - this.remainDivId = this.divId + "_rem"; - this.progressUsedDivId = this.divId + "p_used"; - this.progressRemainDivId = this.divId + "p_remain"; - - __Slider.prototype.setWidth = function(value) - { - this.width = 1 * value; - }; - - __Slider.prototype.setHeight = function(value) - { - this.height = 1 * value; - }; - - __Slider.prototype.setMinValue = function(value) - { - this.minValue = 1 * value; - }; - - __Slider.prototype.setMaxValue = function(value) - { - this.maxValue = 1 * value; - }; - - __Slider.prototype.setStep = function(value) - { - this.stepAmt = 1 * value; - }; - - __Slider.prototype.setOrientation = function(value) - { - this.horizontal = (value == qfSlider_HORIZONTAL); - }; - - __Slider.prototype.setOnChange = function(func) - { - this.onChange = func; - }; - - __Slider.prototype.setPosition = function(value) - { - this.position = 1 * value; - this.step(0); - }; - - __Slider.prototype.setClassName = function(value) - { - this.className = value; - }; - - __Slider.prototype.setThumbClassName = function(value) - { - this.thumbClassName = value; - }; - - __Slider.prototype.setShowThumb = function(value) - { - this.showThumb = value; - }; - - __Slider.prototype.setThumbLimits = function(value) - { - this.thumbLimits = value; - }; - - __Slider.prototype.setShowUsed = function(value) - { - this.showUsed = value; - }; - - __Slider.prototype.setUsedLimits = function(value) - { - this.usedLimits = value; - }; - - __Slider.prototype.setUsedColour = function(value) - { - this.usedColour = value; - }; - - __Slider.prototype.setUsedClassName = function(value) - { - this.usedClassName = value; - }; - - __Slider.prototype.setShowRemain = function(value) - { - this.showRemain = value; - }; - - __Slider.prototype.setRemainLimits = function(value) - { - this.remainLimits = value; - }; - - __Slider.prototype.setRemainColour = function(value) - { - this.remainColour = value; - }; - - __Slider.prototype.setRemainClassName = function(value) - { - this.remainClassName = value; - }; - - __Slider.prototype.setShowProgress = function(value) - { - this.showProgress = value; - }; - - __Slider.prototype.setProgressClassName = function(value) - { - this.progressClassName = value; - }; - - __Slider.prototype.setReversePaint = function(value) - { - this.reversePaint = value; - }; - - __Slider.prototype.getHTML = function() - { - var html = ""; - - // Used for internal sizings of the div (excluding the border). - var innerDivTag = new __Tag("div"); - innerDivTag.setAttribute("id", this.innerDivId); - innerDivTag.setAttribute("style", "position:relative;width:100%;height:100%"); - html += innerDivTag.getHTML(); - - // Used Div - var usedDivTag = new __Tag("div"); - usedDivTag.setAttribute("id", this.usedDivId); - var usedStyle = "visibility:hidden;position:absolute;"; - - if (this.usedClassName != "") - usedDivTag.setAttribute("class", this.usedClassName); - else if (this.usedColor != "") - usedStyle += "background-color:" + this.usedColour; - - usedDivTag.setAttribute("style", usedStyle); - html += usedDivTag.getHTML(); - - // Remaining Div - var remainDivTag = new __Tag("div"); - remainDivTag.setAttribute("id", this.remainDivId); - - var remainStyle = "visibility:hidden;position:absolute;"; - - if (this.remainClassName != "") - remainDivTag.setAttribute("class", this.remainClassName); - else if (this.remainColor != "") - remainStyle += "background-color:" + this.remainColour; - - remainDivTag.setAttribute("style", remainStyle); - html += remainDivTag.getHTML(); - - // Progress Text - var progDivTag = new __Tag("div"); - progDivTag.setAttribute("id", this.progressUsedDivId); - var progStyle = "visibility:hidden;position:absolute;"; - if (this.progressClassName != "") - progDivTag.setAttribute("class", this.progressClassName); - progDivTag.setAttribute("style", progStyle); - html += progDivTag.getHTML(); - - progDivTag = new __Tag("div"); - progDivTag.setAttribute("id", this.progressRemainDivId); - progStyle = "visibility:hidden;position:absolute;"; - if (this.progressClassName != "") - progDivTag.setAttribute("class", this.progressClassName); - progDivTag.setAttribute("style", progStyle); - html += progDivTag.getHTML(); - - // Thumb Div - var thumbDivTag = new __Tag("div"); - thumbDivTag.setAttribute("id", this.thumbDivId); - thumbDivTag.setAttribute("class", this.thumbClassName); - thumbDivTag.setAttribute("style", "visibility:hidden;position:absolute;"); - html += thumbDivTag.getHTML(); - - return html; - }; - - __Slider.prototype.getSliderProperties = function(limits) - { - var population = Math.abs(this.maxValue - this.minValue); - var min = Math.min(this.minValue, this.maxValue); - var max = Math.max(this.minValue, this.maxValue); - - var percent = (this.position - min)/population; - - var sliderDims = __getControlDim(getObject(this.innerDivId)); - - if (limits) - { - sliderDims.width = sliderDims.width - limits.right - limits.left; - sliderDims.height = sliderDims.height - limits.bottom - limits.top; - } - - var sliderSize = 0; - if (this.horizontal) - sliderSize = Math.round(sliderDims.width * percent); - else - sliderSize = Math.round(sliderDims.height * percent); - - if (this.minValue > this.maxValue) - sliderSize = sliderDims.width - sliderSize; - - return ( {dims:sliderDims, size:sliderSize, population:population, percent:percent, min:min, max:max} ); - }; - - __Slider.prototype.repaint = function() - { - this.divCtl.className = this.className; - this.divCtl.innerHTML = this.getHTML(); - - this.divCtl.style.width = this.width + "px"; - - if (this.showThumb) - { - // Allow the thumb to be dragged. - var thumbObject = getObject(this.thumbDivId); - __browser.chainEvent(thumbObject, "mousedown", dragStart); - - var props = this.getSliderProperties(this.thumbLimits); - var styleObject = getStyleObject(this.thumbDivId); - - if (this.horizontal) - { - if (this.reversePaint) - styleObject.left = this.thumbLimits.left + (props.dims.width - props.size - (styleObject.width / 2)); - else - styleObject.left = this.thumbLimits.left + (props.size - (styleObject.width / 2)); - - styleObject.top = this.thumbLimits.top; - } - else - { - if (this.reversePaint) - styleObject.top = this.thumbLimits.top + (props.size - (styleObject.height / 2)); - else - styleObject.top = this.thumbLimits.top + (props.dims.height - props.size - (styleObject.height / 2)); - - styleObject.left = this.thumbLimits.left; - } - styleObject.visibility = "visible"; - } - - if (this.showUsed) - { - var props = this.getSliderProperties(this.usedLimits); - var styleObject = getStyleObject(this.usedDivId); - - if (this.horizontal) - { - if (this.reversePaint) - styleObject.left = this.usedLimits.left + props.dims.width - props.size; - else - styleObject.left = this.usedLimits.left; - styleObject.top = this.usedLimits.top; - styleObject.height = props.dims.height + "px"; - styleObject.fontSize = "1px"; // Hack for IE - styleObject.width = props.size + "px"; - } - else - { - if (this.reversePaint) - styleObject.top = this.usedLimits.top; - else - styleObject.top = this.usedLimits.top + props.dims.height - props.size; - styleObject.left = this.usedLimits.left; - styleObject.width = props.dims.width + "px"; - styleObject.fontSize = "1px"; // Hack for IE - styleObject.height = props.size + "px"; - } - styleObject.visibility = "visible"; - } - - if (this.showRemain) - { - var props = this.getSliderProperties(this.remainLimits); - var styleObject = getStyleObject(this.remainDivId); - - if (this.horizontal) - { - if (this.reversePaint) - styleObject.left = this.remainLimits.left; - else - styleObject.left = this.remainLimits.left + props.size; - styleObject.top = this.remainLimits.top; - styleObject.height = props.dims.height + "px"; - styleObject.fontSize = "1px"; // Hack for IE - styleObject.width = (props.dims.width - props.size) + "px"; - } - else - { - if (this.reversePaint) - styleObject.top = this.remainLimits.top + props.size; - else - styleObject.top = this.remainLimits.top; - styleObject.left = this.remainLimits.left; - styleObject.width = props.dims.width + "px"; - styleObject.fontSize = "1px"; // Hack for IE - styleObject.height = (props.dims.height - props.size) + "px"; - } - - styleObject.visibility = "visible"; - } - - if (this.showProgress) - { - var props = this.getSliderProperties(this.usedLimits); - var usedStyleObject = getStyleObject(this.usedDivId); - var remainStyleObject = getStyleObject(this.remainDivId); - var baseStyleObject = this.divCtl.style; - - // Used side - var styleObject = getStyleObject(this.progressUsedDivId); - - styleObject.left = usedStyleObject.left; - styleObject.top = usedStyleObject.top; - styleObject.height = usedStyleObject.height; - - if (this.showRemain) - styleObject.color = remainStyleObject.backgroundColor; - else - styleObject.color = inverseRGB(baseStyleObject.backgroundColor); - - if (this.horizontal) - { - styleObject.width = props.dims.width + "px"; - styleObject.textAlign = "center"; - styleObject.clip = "rect(0px, " + props.size + "px, " + props.dims.height + "px, 0px)"; - getObject(this.progressUsedDivId).innerHTML = Math.round(props.percent * 100) + "%"; - } - else - { - // TODO vertical clipping - } - styleObject.visibility = "visible"; - - // Remain side - props = this.getSliderProperties(this.remainsLimits); - styleObject = getStyleObject(this.progressRemainDivId); - - if (this.horizontal) - { - styleObject.left = this.remainLimits.left; - styleObject.top = this.remainLimits.top; - styleObject.height = props.dims.height + "px"; - styleObject.width = props.dims.width + "px"; - - if (this.showUsed) - styleObject.color = usedStyleObject.backgroundColor; - else - styleObject.color = inverseRGB(baseStyleObject.backgroundColor); - - styleObject.textAlign = "center"; - styleObject.clip = "rect(0px, " + props.dims.width + "px, " + props.dims.height + "px, " + props.size + "px)"; - getObject(this.progressRemainDivId).innerHTML = Math.round(props.percent * 100) + "%"; - } - else - { - // TODO vertical clipping - } - - styleObject.visibility = "visible"; - } - }; - - __Slider.prototype.step = function(delta) - { - this.position = this.position + (delta * this.stepAmt); - - var min = Math.min(this.minValue, this.maxValue); - var max = Math.max(this.minValue, this.maxValue); - - if (this.position < min) - this.position = min; - - if (this.position > max) - this.position = max; - - this.repaint(); - - if (this.onChange) - this.onChange(this); - }; - - var dragDiv; - var dragDivId; - var dragStartMousePos; - var dragStartSliderPos; - - function dragStart(event) - { - var thumbDiv = __browser.getEventTarget(event); - dragDiv = thumbDiv; - dragStartMousePos = __browser.getMousePos(event); - - var slider = qfSliderFactory.getSliderByName(thumbDiv.id.split("_")[2]); - dragStartSliderPos = slider.position; - - __browser.chainEvent(document, "mousemove", dragMove); - __browser.chainEvent(document, "mouseup", dragDrop); - __browser.stopEventBubble(event); - } - - function dragMove(event) - { - var mousePos = __browser.getMousePos(event); - - var thumbDiv = dragDiv; - var slider = qfSliderFactory.getSliderByName(thumbDiv.id.split("_")[2]); - - var styleObject = getStyleObject(thumbDiv.id); - var thumbDims = __getControlDim(getObject(thumbDiv.id)); - var props = slider.getSliderProperties(slider.thumbLimits); - - // Limit movement of thumb within boundaries of the containing thumb limits - if (slider.horizontal) - { - var newLeft = mousePos.x - props.dims.x - thumbDims.width / 2; - - if (newLeft < slider.thumbLimits.left) - newLeft = slider.thumbLimits.left; - if (newLeft > (slider.thumbLimits.left + props.dims.width)) - newLeft = slider.thumbLimits.left + props.dims.width; - - var percent = (newLeft - slider.thumbLimits.left) / props.dims.width; - if (this.reversePaint) - percent = 1 - percent; - - var min = Math.min(slider.minValue, slider.maxValue); - var max = Math.max(slider.minValue, slider.maxValue); - - var pos = ((max - min) * percent).roundedValue(slider.stepAmt); - - slider.setPosition(pos); - slider.repaint(); - } - else - { - var min = Math.min(slider.minValue, slider.maxValue); - var max = Math.max(slider.minValue, slider.maxValue); - var pos = (dragStartSliderPos - (mousePos.y - dragStartMousePos.y) / props.dims.height * (max - min)).roundedValue(slider.stepAmt); - - slider.setPosition(pos); - slider.repaint(); - } - - __browser.stopEventBubble(event); - }; - - function dragDrop(event) - { - __browser.unchainEvent(document, "mousemove", dragMove); - __browser.unchainEvent(document, "mouseup", dragDrop); - }; -} - - -var qfSliderFactory = new __SliderFactory(); \ No newline at end of file Deleted: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,29 +0,0 @@ -Seam Remoting/Progressbar Example -================================= - -This example shows how to create a progress bar using Seam Remoting. -It runs on JBoss AS as an EAR and on Tomcat with JBoss Embedded as a WAR. - -To deploy the example to JBossAS, follow these steps: - -* In the example root directory run: - - mvn clean package - -* Set JBOSS_HOME environment property. - -* In the progressbar-ear directory run: - - mvn jboss:hard-deploy - -* Open this URL in a web browser: http://localhost:8080/seam-progressbar - -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from progressbar-web/target directory to Tomcat manually - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-progressbar Modified: branches/enterprise/WFK-2_0/examples-ee6/restbay/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/restbay/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/restbay/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -2,9 +2,9 @@ ==================== This example shows Seam/JAX-RS RESTful HTTP webservices integration. -It runs on JBoss AS as an EAR. +It runs an EAR. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,7 +14,7 @@ * In the restbay-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-restbay Modified: branches/enterprise/WFK-2_0/examples-ee6/seambay/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seambay/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seambay/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam SeamBay Example ==================== -This example shows Seam/WS integration. It runs on JBoss AS as an EAR and -JBoss with Embedded JBoss as a WAR. +This example shows Seam/WS integration. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,16 +13,7 @@ * In the seambay-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-seambay -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from seambay-web/target directory to Tomcat manually - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-seambay Modified: branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -82,76 +82,5 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>seambay-ejb</artifactId> - <type>ejb</type> - <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> - <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> - </dependency> - </dependencies> - <build> - <finalName>jboss-seam-seambay</finalName> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../seambay-ear/src/main/resources</directory> - <includes> - <include>jboss-seam-seambay-ds.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -25,9 +25,9 @@ </tr:table> -This example runs on JBoss AS as an EAR. +This example runs as an EAR. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: Modified: branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -109,18 +109,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/src/main/resources/jboss-seam-seamdiscs-ds.xml</param> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> - </fileNames> - </configuration> - </plugin> </plugins> </build> </profile> Modified: branches/enterprise/WFK-2_0/examples-ee6/seampay/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seampay/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seampay/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,8 +1,7 @@ Seam Seampay Example ==================== -This example shows Seam's EJB3 timer support. It runs on JBoss AS as an EAR -and Tomcat with Embedded JBoss as a WAR. +This example shows Seam's EJB3 timer support. To deploy the example to JBoss AS, follow these steps: @@ -14,16 +13,7 @@ * In the seampay-ear directory, run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-seampay -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory, run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from seampay-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-seampay Modified: branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -77,79 +77,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.seampay</groupId> - <artifactId>seampay-ejb</artifactId> - <type>ejb</type> - <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> - <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>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - </dependencies> - <build> - <finalName>jboss-seam-seampay</finalName> - </build> - </profile> - </profiles> - </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamspace/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamspace/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seamspace/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,8 +1,7 @@ Seam Seamspace Example ====================== -This example demonstrates Seam Security. It runs on JBoss AS as an EAR and -Tomcat with Embedded JBoss as a WAR. +This example demonstrates Seam Security. To deploy the example to JBoss AS, follow these steps: @@ -14,16 +13,7 @@ * In the seamspace-ear directory, run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-seamspace -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory, run: - - mvn clean package -Ptomcat - -* Deploy the resulting war from seamspace-web/target directory to Tomcat manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-seamspace Modified: branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -72,137 +72,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.seamspace</groupId> - <artifactId>seamspace-ejb</artifactId> - <type>ejb</type> - <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> - <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>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <exclusions> - <exclusion> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-decisiontables</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-templates</artifactId> - </dependency> - <dependency> - <groupId>net.sourceforge.jexcelapi</groupId> - <artifactId>jxl</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <finalName>jboss-seam-seamspace</finalName> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../seamspace-ear/src/main/resources</directory> - <includes> - <include>jboss-seam-space-ds.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - </build> - </profile> - </profiles> - </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/spring/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/spring/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/spring/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,10 @@ Seam Spring Example =================== -This example shows Seam/Spring integration. This application runs on JBoss AS as +This example shows Seam/Spring integration. This application runs on AS as a WAR file. -To deploy the example to JBossAS 5, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,9 +14,5 @@ * In the spring-web directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy -When deploying to JBossAS 4, use a -Pjbossas42 maven profile to package the -application. Use -Pjbossas6 for JBossAS 6 accordingly. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-spring Modified: branches/enterprise/WFK-2_0/examples-ee6/tasks/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/tasks/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/tasks/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam Tasks Example ================== -This example demonstrates the integration with RestEasy. It runs on JBoss -AS as an EAR +This example demonstrates the integration with RestEasy. It runs as an EAR. -To deploy the example to JBoss AS, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -14,6 +13,6 @@ * In the tasks-ear directory run: - mvn jboss:hard-deploy + mvn jboss-as:deploy * Open this URL in a web browser: http://localhost:8080/seam-tasks Modified: branches/enterprise/WFK-2_0/examples-ee6/ui/readme.txt =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/readme.txt 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/readme.txt 2012-06-11 07:39:53 UTC (rev 14897) @@ -1,10 +1,9 @@ Seam UI Example =============== -This is a simple example demonstrating Seam UI. It runs on JBoss -AS7 as an EAR +This is a simple example demonstrating Seam UI. -To deploy the example to JBoss AS7, follow these steps: +To deploy the example, follow these steps: * In the example root directory run: @@ -12,14 +11,11 @@ * Set JBOSS_HOME environment property. -* Start the AS7 up. +* Start up the server. -* In the ui-ear directory run the following to create a ui datasource: +* Change directory to ui-ear and deploy the sample: - $JBOSS_HOME/bin/jboss-cli.sh --file=ui-ds.cli + mvn jboss-as:deploy -* Deploy the sample: - - $JBOSS_HOME/bin/jboss-cli.sh --connect 'deploy ui-ear/target/seam-ui.ear' - * Open this URL in a web browser: http://localhost:8080/seam-ui + Modified: branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -101,28 +101,6 @@ </plugins> </build> </profile> - <profile> - <id>ftest-tomcat</id> - <properties> - <example.context.path>jboss-seam-ui</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/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml 2012-06-11 07:39:53 UTC (rev 14897) @@ -84,50 +84,4 @@ </plugins> </build> - <profiles> - <profile> - <id>tomcat</id> - <properties> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.ui</groupId> - <artifactId>ui-ejb</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.sun.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-ui</finalName> - </build> - </profile> - </profiles> </project>

11 years, 10 months

1
0
0 / 0

Seam SVN: r14896 - in branches/enterprise/WFK-2_0: jboss-seam and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 03:37:33 -0400 (Mon, 11 Jun 2012) New Revision: 14896 Modified: branches/enterprise/WFK-2_0/jboss-seam/pom.xml branches/enterprise/WFK-2_0/pom.xml Log: removed hsqldb and concurrent, plus tidy up profiles in parent Modified: branches/enterprise/WFK-2_0/jboss-seam/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-06-11 07:37:24 UTC (rev 14895) +++ branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) @@ -350,24 +350,11 @@ </dependency> <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <optional>true</optional> - </dependency> - - - - - - - - <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java-consumer</artifactId> <type>pom</type> <optional>true</optional> </dependency> - <dependency> <groupId>org.jboss.spec.javax.faces</groupId> Modified: branches/enterprise/WFK-2_0/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/pom.xml 2012-06-11 07:37:24 UTC (rev 14895) +++ branches/enterprise/WFK-2_0/pom.xml 2012-06-11 07:37:33 UTC (rev 14896) @@ -97,18 +97,6 @@ </dependency> <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.8-brew</version> - </dependency> - - <dependency> <groupId>emma</groupId> <artifactId>emma</artifactId> <version>2.0.5312</version> @@ -284,16 +272,15 @@ <profiles>  - - - - - - + <profile> + <id>doc</id> + <modules> + <module>seam-reference-guide</module> + </modules> + </profile> <profile> <id>all</id> <modules> - <module>examples-ee6</module> <module>distribution</module> </modules> @@ -301,7 +288,6 @@ <profile> <id>distribution</id> <modules> - <module>distribution</module> </modules> </profile>

11 years, 10 months

1
0
0 / 0

Seam SVN: r14895 - branches/enterprise/WFK-2_0/bom.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-06-11 03:37:24 -0400 (Mon, 11 Jun 2012) New Revision: 14895 Modified: branches/enterprise/WFK-2_0/bom/pom.xml Log: bz #814075 replaced dom4j version to redhat-1 Modified: branches/enterprise/WFK-2_0/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-10 20:36:25 UTC (rev 14894) +++ branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-11 07:37:24 UTC (rev 14895) @@ -743,7 +743,7 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1-brew</version> + <version>1.6.1-redhat-1</version> <exclusions> <exclusion> <groupId>xml-apis</groupId>

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits June 2012