Seam SVN: r15310 - in branches/community/Seam_2_3/examples: groovybooking/groovybooking-web/src/main/webapp and 6 other directories.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-19 10:03:44 -0400 (Fri, 19 Oct 2012)
New Revision: 15310
Modified:
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/conversations.xhtml
branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml
branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/conversations.xhtml
branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/buy.xhtml
branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
branches/community/Seam_2_3/examples/seampay/seampay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
Log:
examples, return s:converters
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/conversations.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/conversations.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/conversations.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -21,13 +21,13 @@
</h:column>
<h:column id="column2">
<h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}">
- <!--<s:convertDateTime type="time" pattern="kk:mm:ss"/>-->
- <f:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <s:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <!-- <f:convertDateTime type="time" pattern="kk:mm:ss"/> -->
</h:outputText>
-
<h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}">
- <!--<s:convertDateTime type="time" pattern="hh:mm"/>-->
- <f:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <s:convertDateTime type="time" pattern="hh:mm"/>
+ <!-- <f:convertDateTime type="time" pattern="kk:mm:ss"/> -->
</h:outputText>
</h:column>
</h:dataTable>
Modified: branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -21,13 +21,13 @@
</h:column>
<h:column id="column2">
<h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}">
- <!--<s:convertDateTime type="time" pattern="kk:mm:ss"/>-->
- <f:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <s:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <!-- <f:convertDateTime type="time" pattern="kk:mm:ss"/> -->
</h:outputText>
-
<h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}">
- <!--<s:convertDateTime type="time" pattern="hh:mm"/>-->
- <f:convertDateTime type="time" pattern="kk:mm:ss"/>
+ <s:convertDateTime type="time" pattern="hh:mm"/>
+ <!-- <f:convertDateTime type="time" pattern="kk:mm:ss"/> -->
</h:outputText>
</h:column>
</h:dataTable>
Modified: branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/conversations.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/conversations.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/jee6/jee6-web/src/main/webapp/conversations.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -21,12 +21,10 @@
</h:column>
<h:column id="column2">
<h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}">
- <!--<s:convertDateTime type="time" pattern="kk:mm:ss"/>-->
<f:convertDateTime type="time" pattern="kk:mm:ss"/>
</h:outputText>
-
<h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}">
- <!--<s:convertDateTime type="time" pattern="hh:mm"/>-->
<f:convertDateTime type="time" pattern="kk:mm:ss"/>
</h:outputText>
</h:column>
Modified: branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/quartz/quartz-web/src/main/webapp/search.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -153,8 +153,8 @@
<h:selectOneRadio id="radioList"
layout="lineDirection"
value="#{newPayment.paymentFrequency}">
- <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
- <!-- <s:convertEnum />-->
+<!-- <f:converter converterId="org.jboss.seam.ui.EnumConverter" />-->
+ <s:convertEnum />
<s:enumItem enumValue="ONCE" label="Only Once" />
<s:enumItem enumValue="EVERY_MINUTE" label="Every Minute (testing)" />
<s:enumItem enumValue="HOURLY" label="Every Hour (testing)" />
Modified: branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/buy.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/buy.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/buy.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -34,8 +34,7 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}" styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat" value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat" label="#{cat.name}" noSelectionLabel="All Categories"/>
- <!--<s:convertEntity />-->
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+ <s:convertEntity />
</h:selectOneMenu>
<br/>
Modified: branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/search.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/seambay/seambay-web/src/main/webapp/search.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -25,8 +25,7 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}" styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat" value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat" label="#{cat.name}" noSelectionLabel="All Categories"/>
- <!--<s:convertEntity />-->
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+ <s:convertEntity />
</h:selectOneMenu>
<h:commandButton action="#{auctionSearch.queryAuctions}" value="Search"/>
Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -18,8 +18,7 @@
<tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2100" stepSize="1" readOnly="#{not identity.loggedIn}" columns="4"/>
<tr:selectOneChoice value="#{disc.artist}" label="Artist" required="true" readOnly="#{not identity.loggedIn}">
<s:selectItems value="#{allArtists.resultList}" var="artist" label="#{artist.name}" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
- <!--<s:convertEntity />-->
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+ <s:convertEntity />
</tr:selectOneChoice>
<tr:panelLabelAndMessage label="Details">
<tr:inputText simple="true" value="#{disc.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
Modified: branches/community/Seam_2_3/examples/seampay/seampay-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/seampay/seampay-web/src/main/webapp/search.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/seampay/seampay-web/src/main/webapp/search.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -131,8 +131,7 @@
<h:selectOneRadio id="radioList"
layout="lineDirection"
value="#{newPayment.paymentFrequency}">
- <!--<s:convertEnum /> -->
- <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
+ <s:convertEnum />
<s:enumItem id="once" enumValue="ONCE" label="Only Once" />
<s:enumItem id="everyMinute" enumValue="EVERY_MINUTE" label="Every Minute (testing)" />
<s:enumItem id="hourly" enumValue="HOURLY" label="Every Hour (testing)" />
Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
+++ branches/community/Seam_2_3/examples/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml 2012-10-19 14:03:44 UTC (rev 15310)
@@ -54,8 +54,7 @@
<div class="selectMany">
<h:selectManyListbox id="friends" value="#{imagePermission.selectedFriends}" styleClass="roles" size="6">
<s:selectItems value="#{imagePermission.availableFriends}" var="friend" label="#{friend.memberName}"/>
- <!--<s:convertEntity />-->
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+ <s:convertEntity />
</h:selectManyListbox>
</div>
<div class="validationError"><h:message for="friends"/></div>
12 years, 1 month
Seam SVN: r15309 - branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-19 09:48:14 -0400 (Fri, 19 Oct 2012)
New Revision: 15309
Modified:
branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/selectItems.xhtml
Log:
back to s:convert*
Modified: branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/selectItems.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/selectItems.xhtml 2012-10-19 13:22:24 UTC (rev 15308)
+++ branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/selectItems.xhtml 2012-10-19 13:48:14 UTC (rev 15309)
@@ -27,8 +27,9 @@
<ui:define name="label">Title</ui:define>
<h:selectOneMenu value="#{person.honorific}">
<s:selectItems value="#{honorifics}" var="honorific" label="#{honorific.label}" noSelectionLabel="Please select" />
- <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
-<!-- look above how JSF 2 changed, no need to create custom Tag <s:convertEnum /> -->
+ <!-- no need to use custom Tag s:convertEnum
+ <f:converter converterId="org.jboss.seam.ui.EnumConverter" />-->
+ <s:convertEnum />
</h:selectOneMenu>
</s:decorate>
@@ -42,8 +43,8 @@
<ui:define name="label">Continent of Birth</ui:define>
<h:selectOneMenu value="#{personHome.instance.continent}" required="true" id="continent">
<s:selectItems value="#{continents.resultList}" var="continent" label="#{continent.name}" noSelectionLabel="Please Select..."/>
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
-<!-- <s:convertEntity /> -->
+<!-- <f:converter converterId="org.jboss.seam.ui.EntityConverter" /> -->
+ <s:convertEntity />
</h:selectOneMenu>
</s:decorate>
@@ -51,8 +52,8 @@
<ui:define name="label">Country of Birth</ui:define>
<h:selectOneRadio value="#{personHome.instance.country}" required="true" disabled="#{empty person.continent}">
<s:selectItems value="#{personHome.instance.continent.countries}" var="country" label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" converter="org.jboss.seam.ui.EntityConverter"/>
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
-<!-- <s:convertEntity /> -->
+<!-- <f:converter converterId="org.jboss.seam.ui.EntityConverter" /> -->
+ <s:convertEntity />
</h:selectOneRadio>
</s:decorate>
@@ -60,8 +61,8 @@
<ui:define name="label">Roles</ui:define>
<h:selectManyCheckbox value="#{person.roles}" required="true" collectionType="java.util.ArrayList">
<s:selectItems value="#{roles}" var="role" label="#{role.name}"/>
- <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
-<!-- <s:convertEnum /> -->
+<!-- <f:converter converterId="org.jboss.seam.ui.EnumConverter" /> -->
+ <s:convertEnum />
</h:selectManyCheckbox>
</s:decorate>
@@ -87,8 +88,8 @@
<ui:define name="description">A colour is an entity</ui:define>
<h:selectManyListbox value="#{personHome.instance.favouriteColours}" collectionType="java.util.ArrayList">
<s:selectItems value="#{colours.resultList}" var="colour" label="#{colour.name}"/>
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
-<!-- <s:convertEntity /> -->
+<!-- <f:converter converterId="org.jboss.seam.ui.EntityConverter" /> -->
+ <s:convertEntity />
</h:selectManyListbox>
</s:decorate>
@@ -97,8 +98,8 @@
<ui:define name="description">A book has a composite key</ui:define>
<h:selectOneListbox value="#{person.favouriteBook}" >
<s:selectItems value="#{books.resultList}" var="book" label="#{book.name} by #{book.author} (#{book.nationality})"/>
- <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
-<!-- <s:convertEntity /> -->
+<!-- <f:converter converterId="org.jboss.seam.ui.EntityConverter" /> -->
+ <s:convertEntity />
</h:selectOneListbox>
</s:decorate>
12 years, 1 month
Seam SVN: r15308 - branches/enterprise/WFK-2_1/examples/mail.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-19 09:22:24 -0400 (Fri, 19 Oct 2012)
New Revision: 15308
Removed:
branches/enterprise/WFK-2_1/examples/mail/build.xml
Log:
removed ant script from Mail example maven project
Deleted: branches/enterprise/WFK-2_1/examples/mail/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/mail/build.xml 2012-10-19 12:28:52 UTC (rev 15307)
+++ branches/enterprise/WFK-2_1/examples/mail/build.xml 2012-10-19 13:22:24 UTC (rev 15308)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Seam Mail" default="deploy" basedir=".">
- <!-- Example name -->
- <property name="Name" value="Mail example" />
- <property name="example.name" value="jboss-seam-email" />
-
- <!-- Libraries -->
- <property name="seam.ui.lib" value="yes" />
- <property name="seam.mail.lib" value="yes" />
- <property name="deploy.meldware.mail" value="yes" />
- <property name="seam.pdf.lib" value="yes"/>
- <property name="seam.excel.lib" value="yes"/>
- <property name="seam.debug.lib" value="yes" />
- <property name="facelets.lib" value="yes" />
-
- <import file="../build.xml" />
-
- <patternset id="test.view.files">
- <include name="*.*" />
- </patternset>
-
- <patternset id="test.src.files">
- <include name="**/*.xml" />
- <include name="**/*.xhtml" />
- </patternset>
-
- <path id="test.classpath.extras">
- <path location="${lib.dir}/jboss-seam-ui.jar" />
- </path>
-
- <path id="build.classpath.extras">
- <path location="${lib.dir}/jboss-seam-mail.jar" />
- <path location="${lib.dir}/jboss-seam-pdf.jar" />
- <path location="${lib.dir}/jboss-seam-excel.jar" />
- </path>
-
-</project>
-
12 years, 1 month
Seam SVN: r15307 - branches/enterprise/WFK-2_1/examples/restbay/restbay-ear.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-19 08:28:52 -0400 (Fri, 19 Oct 2012)
New Revision: 15307
Modified:
branches/enterprise/WFK-2_1/examples/restbay/restbay-ear/pom.xml
Log:
examples, restbay, initialize-in-order
Modified: branches/enterprise/WFK-2_1/examples/restbay/restbay-ear/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/restbay/restbay-ear/pom.xml 2012-10-19 12:28:30 UTC (rev 15306)
+++ branches/enterprise/WFK-2_1/examples/restbay/restbay-ear/pom.xml 2012-10-19 12:28:52 UTC (rev 15307)
@@ -57,7 +57,13 @@
<version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<filtering>true</filtering>
+ <initializeInOrder>true</initializeInOrder>
<modules>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples.restbay</groupId>
+ <artifactId>restbay-ejb</artifactId>
+ <bundleFileName>restbay-ejb.jar</bundleFileName>
+ </ejbModule>
<webModule>
<groupId>org.jboss.seam.examples.restbay</groupId>
<artifactId>restbay-web</artifactId>
@@ -65,11 +71,6 @@
<bundleFileName>restbay-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples.restbay</groupId>
- <artifactId>restbay-ejb</artifactId>
- <bundleFileName>restbay-ejb.jar</bundleFileName>
- </ejbModule>
- <ejbModule>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<bundleFileName>jboss-seam.jar</bundleFileName>
12 years, 1 month
Seam SVN: r15306 - branches/community/Seam_2_3/examples/restbay/restbay-ear.
by seam-commits@lists.jboss.org
Author: maschmid
Date: 2012-10-19 08:28:30 -0400 (Fri, 19 Oct 2012)
New Revision: 15306
Modified:
branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml
Log:
examples, restbay, initialize-in-order
Modified: branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml 2012-10-19 10:45:58 UTC (rev 15305)
+++ branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml 2012-10-19 12:28:30 UTC (rev 15306)
@@ -57,7 +57,13 @@
<version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<filtering>true</filtering>
+ <initializeInOrder>true</initializeInOrder>
<modules>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples.restbay</groupId>
+ <artifactId>restbay-ejb</artifactId>
+ <bundleFileName>restbay-ejb.jar</bundleFileName>
+ </ejbModule>
<webModule>
<groupId>org.jboss.seam.examples.restbay</groupId>
<artifactId>restbay-web</artifactId>
@@ -65,11 +71,6 @@
<bundleFileName>restbay-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples.restbay</groupId>
- <artifactId>restbay-ejb</artifactId>
- <bundleFileName>restbay-ejb.jar</bundleFileName>
- </ejbModule>
- <ejbModule>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<bundleFileName>jboss-seam.jar</bundleFileName>
12 years, 1 month
Seam SVN: r15304 - in branches/enterprise/WFK-2_1: examples/hibernate/hibernate-web/src/glassfish/resources and 8 other directories.
by seam-commits@lists.jboss.org
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>
12 years, 1 month
Seam SVN: r15301 - branches/enterprise/WFK-2_1.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-10-19 04:28:32 -0400 (Fri, 19 Oct 2012)
New Revision: 15301
Modified:
branches/enterprise/WFK-2_1/pom.xml
Log:
added managed httpmime and xalan for htmlunit test dependencies
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2012-10-19 08:28:25 UTC (rev 15300)
+++ branches/enterprise/WFK-2_1/pom.xml 2012-10-19 08:28:32 UTC (rev 15301)
@@ -141,7 +141,16 @@
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.jbossas7}</version>
</dependency>
-
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1-redhat-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.3-redhat-1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
12 years, 1 month