[seam-commits] Seam SVN: r15304 - in branches/enterprise/WFK-2_1: examples/hibernate/hibernate-web/src/glassfish/resources and 8 other directories.

Author: manaRH Date: 2012-10-19 06:42:17 -0400 (Fri, 19 Oct 2012) New Revision: 15304 Removed: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/import.sql branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/log4j.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/import.sql branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/log4j.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/seam.properties branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.properties branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml Log: bz 866942 - removed glassfish relicts in seam-gen ant scripts Deleted: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,19 +0,0 @@ -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.id.IdentityGenerator; - - -public class GlassfishDerbyDialect extends DerbyDialect { - - public GlassfishDerbyDialect() { - - } - - @Override - public Class getNativeIdentifierGeneratorClass() { - - return IdentityGenerator.class; - } - - - -} Deleted: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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">jdbc/__default</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">GlassfishDerbyDialect</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.SunONETransactionManagerLookup</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_1/examples/hibernate/hibernate-web/src/glassfish/resources/import.sql =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/import.sql 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/import.sql 2012-10-19 10:42:17 UTC (rev 15304) @@ -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 L�opold-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_1/examples/hibernate/hibernate-web/src/glassfish/resources/log4j.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/log4j.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/resources/log4j.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<!-- ===================================================================== --> -<!-- --> -<!-- Log4j Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<!-- $Id: log4j.xml 6987 2007-12-23 19:53:07Z pmuir $ --> - -<!-- - | For more configuration infromation and examples see the Jakarta Log4j - | owebsite: http://jakarta.apache.org/log4j - --> - -<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.hibernate"> - <priority value="DEBUG"/> - </category> - --> - - <!-- - <category name="org.jboss.seam"> - <priority value="DEBUG"/> - </category> - --> - - <!-- - <category name="org.jboss.kernel"> - <priority value="DEBUG"/> - </category> - --> - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,67 +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"> - - <!-- Seam --> - - <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> - - - <!-- Faces Servlet --> - - <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> - - <!-- JSF parameters --> - - <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> \ No newline at end of file Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,19 +0,0 @@ -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.id.IdentityGenerator; - - -public class GlassfishDerbyDialect extends DerbyDialect { - - public GlassfishDerbyDialect() { - - } - - @Override - public Class getNativeIdentifierGeneratorClass() { - - return IdentityGenerator.class; - } - - - -} Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,20 +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="JTA"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>jdbc/__default</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"/> - <!-- Transaction manager lookup is only needed when Seam bootstraps the persistence unit (as opposed to the Java EE container) --> - <!-- - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.SunONETransactionManagerLookup"/> - --> - </properties> - </persistence-unit> -</persistence> Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/import.sql =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/import.sql 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/import.sql 2012-10-19 10:42:17 UTC (rev 15304) @@ -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 L�opold-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_1/examples/jpa/jpa-web/src/glassfish/resources/log4j.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/log4j.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/log4j.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<!-- ===================================================================== --> -<!-- --> -<!-- Log4j Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<!-- $Id: log4j.xml 5706 2007-07-06 21:41:35Z myuan $ --> - -<!-- - | For more configuration infromation and examples see the Jakarta Log4j - | owebsite: http://jakarta.apache.org/log4j - --> - -<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.hibernate"> - <priority value="DEBUG"/> - </category> - --> - - <!-- - <category name="org.jboss.seam"> - <priority value="DEBUG"/> - </category> - --> - - <!-- - <category name="org.jboss.kernel"> - <priority value="DEBUG"/> - </category> - --> - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/resources/seam.properties =================================================================== Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,27 +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"/> - - <!-- You can choose to have Seam load the persistence unit using <persistence:entity-manager-factory>, - but we are leveraging the functionality baked into Java EE --> - - <!-- The JNDI name where the EntityManagerFactory is stored is defined by the <persistence-unit-ref-name> element in web.xml --> - <persistence:managed-persistence-context name="em" auto-create="true" persistence-unit-jndi-name="java:comp/env/bookingEntityManagerFactory"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -</components> Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -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_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,64 +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"> - - <!-- Seam --> - - <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> - - <!-- Faces Servlet --> - - <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> - - <!-- JSF parameters --> - - <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> - - <!-- Forces the container to load the persistence unit when the application is deployed --> - <persistence-unit-ref> - <persistence-unit-ref-name>bookingEntityManagerFactory</persistence-unit-ref-name> - <persistence-unit-name>bookingDatabase</persistence-unit-name> - </persistence-unit-ref> - -</web-app> Deleted: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,8 +0,0 @@ -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository> - seam.jboss.org:loader=jboss-seam-jpa - <loader-repository-config>java2ParentDelegation=false</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -50,9 +50,6 @@ <fileset refid="testlib"/> </path> - <!-- Import GlassFish deployment targets --> - <import file="${basedir}/glassfish-build.xml"/> - <target name="init" description="Initialize the build"> <taskdef name="groovyc" Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.properties =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.properties 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.properties 2012-10-19 10:42:17 UTC (rev 15304) @@ -1,5 +1 @@ jboss.home=@jbossHome@ -glassfish.home=@glassfishHome@ -glassfish.domain=@glassfishDomain@ -# Uncomment to stop the build from deploying the datasource to GlassFish -#glassfish.datasource.useDefault=true Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2012-10-19 10:42:17 UTC (rev 15304) @@ -50,9 +50,6 @@ <fileset refid="testlib"/> </path> - <!-- Import GlassFish deployment targets --> - <import file="${basedir}/glassfish-build.xml"/> - <target name="init" description="Initialize the build"> <taskdef name="groovyc" classname ="org.codehaus.groovy.ant.Groovyc" Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2012-10-19 10:42:17 UTC (rev 15304) @@ -38,10 +38,6 @@ <h:column id="action"> <f:facet name="header">Action</f:facet> <ui:remove> - <!-- There is incompatibility between RichFaces 3.3.0.GA and the version of JSF that ships with JBoss AS 4.2 and GlassFish V2 that - prevents UICommand components in a RichFaces dataTable from firing on the first attempt. If you have upgraded to JSF >= 1.2_12 - you can use the h:commandLink components instead of the s:link compoennts - --> <s:fragment rendered="#{s:hasPermission('seam.role', 'update')}"> <h:commandLink id="edit" value="Edit" action="#{roleAction.editRole(roleSearch.selectedRole)}"/><span> | </span> </s:fragment> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml 2012-10-19 08:39:05 UTC (rev 15303) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml 2012-10-19 10:42:17 UTC (rev 15304) @@ -43,10 +43,6 @@ <h:column id="action"> <f:facet name="header">Action</f:facet> <ui:remove> - <!-- There is incompatibility between RichFaces 3.3.0.GA and the version of JSF that ships with JBoss AS 4.2 and GlassFish V2 that - prevents UICommand components in a RichFaces dataTable from firing on the first attempt. If you have upgraded to JSF >= 1.2_12 - you can use the h:commandLink components instead of the s:link compoennts - --> <s:fragment rendered="#{s:hasPermission('seam.user', 'update')}"> <h:commandLink id="edit" value="Edit" action="#{userAction.editUser(userSearch.selectedUser)}"/><span> | </span> </s:fragment>