[seam-commits] Seam SVN: r7265 - in trunk/examples/jpa/resources-websphere61: WEB-INF and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Mon Jan 28 16:50:43 EST 2008


Author: jbalunas at redhat.com
Date: 2008-01-28 16:50:43 -0500 (Mon, 28 Jan 2008)
New Revision: 7265

Removed:
   trunk/examples/jpa/resources-websphere61/META-INF/ajax4jsf.taglib.xml
   trunk/examples/jpa/resources-websphere61/META-INF/jsf-core.taglib.xml
   trunk/examples/jpa/resources-websphere61/META-INF/jsf-html.taglib.xml
   trunk/examples/jpa/resources-websphere61/META-INF/jsf-ui.taglib.xml
   trunk/examples/jpa/resources-websphere61/META-INF/rich.taglib.xml
   trunk/examples/jpa/resources-websphere61/META-INF/s.taglib.xml
Modified:
   trunk/examples/jpa/resources-websphere61/META-INF/persistence.xml
   trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml
   trunk/examples/jpa/resources-websphere61/WEB-INF/web.xml
Log:
Modified for latest release of Websphere reference chapter.

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/ajax4jsf.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/ajax4jsf.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/ajax4jsf.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
-<namespace>http://richfaces.org/a4j</namespace>
-
-<tag>
-  <tag-name>ajaxListener</tag-name>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.AjaxListenerHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>facet</tag-name>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.FacetHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>keepAlive</tag-name>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.KeepAliveHandler
-      </handler-class>  
- </tag><tag>
-  <tag-name>jsFunction</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Function</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxFunctionRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>status</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Status</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxStatusRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>portlet</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Portlet</component-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>push</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Push</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxPushRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.AjaxPushHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>repeat</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Repeat</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.RepeatRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>commandButton</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.CommandButton</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxCommandButtonRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.webapp.taglib.AjaxComponentHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>actionparam</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.ActionParameter</component-type>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.ActionParamHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>loadScript</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.LoadScript</component-type>
-      <renderer-type>
-        org.ajax4jsf.LoadScriptRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>outputPanel</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.OutputPanel</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxOutputPanelRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>loadBundle</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Bundle</component-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>mediaOutput</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.MediaOutput</component-type>
-      <renderer-type>
-        org.ajax4jsf.MediaOutputRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.MediaOutputHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>log</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Log</component-type>
-      <renderer-type>
-        org.ajax4jsf.LogRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>region</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.AjaxRegion</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxRegionRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>form</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Form</component-type>
-      <renderer-type>
-        org.ajax4jsf.FormRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.webapp.taglib.AjaxComponentHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>htmlCommandLink</tag-name>
-  <component>
-      <component-type>javax.faces.HtmlCommandLink</component-type>
-      <renderer-type>
-        org.ajax4jsf.HtmlCommandLinkRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>commandLink</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.CommandLink</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxCommandLinkRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.webapp.taglib.AjaxComponentHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>support</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Support</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxSupportRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.AjaxSupportHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>loadStyle</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.LoadStyle</component-type>
-      <renderer-type>
-        org.ajax4jsf.LoadStyleRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>poll</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Poll</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxPollRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.webapp.taglib.AjaxComponentHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>page</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.components.Page</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxPageRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>include</tag-name>
-  <component>
-      <component-type>org.ajax4jsf.Include</component-type>
-      <renderer-type>
-        org.ajax4jsf.components.AjaxIncludeRenderer
-      </renderer-type>
-        <handler-class>
-        org.ajax4jsf.taglib.html.facelets.IncludeHandler
-      </handler-class>
-  </component>
-  
- </tag>
-</facelet-taglib>
\ No newline at end of file

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/jsf-core.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/jsf-core.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/jsf-core.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- Licensed under the Common Development and Distribution License,
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-   http://www.sun.com/cddl/
-   
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- implied. See the License for the specific language governing
- permissions and limitations under the License.
- 
- $Id: jsf-core.taglib.xml,v 1.3 2005/07/27 04:47:46 jhook Exp $
--->
-
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-
-<facelet-taglib>
-	<library-class>com.sun.facelets.tag.jsf.core.CoreLibrary</library-class>
-</facelet-taglib>
\ No newline at end of file

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/jsf-html.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/jsf-html.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/jsf-html.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- Licensed under the Common Development and Distribution License,
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-   http://www.sun.com/cddl/
-   
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- implied. See the License for the specific language governing
- permissions and limitations under the License.
- 
- $Id: jsf-html.taglib.xml,v 1.3 2005/07/27 04:47:46 jhook Exp $
--->
-
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-
-<facelet-taglib>
-	<library-class>com.sun.facelets.tag.jsf.html.HtmlLibrary</library-class>
-</facelet-taglib>
\ No newline at end of file

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/jsf-ui.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/jsf-ui.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/jsf-ui.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- Licensed under the Common Development and Distribution License,
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-   http://www.sun.com/cddl/
-   
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- implied. See the License for the specific language governing
- permissions and limitations under the License.
- 
- $Id: jsf-ui.taglib.xml,v 1.2 2005/07/18 08:25:39 jhook Exp $
--->
-
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-
-<facelet-taglib>
-	<library-class>com.sun.facelets.tag.ui.UILibrary</library-class>
-</facelet-taglib>
\ No newline at end of file

Modified: trunk/examples/jpa/resources-websphere61/META-INF/persistence.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/persistence.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/persistence.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="bookingDatabase" transaction-type="JTA">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
+             version="1.0">
+   <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
       <jta-data-source>DefaultDatasource</jta-data-source>
       <properties>
-         <!--
-         <property name="hibernate.dialect" 
-                    value="org.hibernate.dialect.PointbaseDialect"/>
-         -->
          <!-- From WAS 6.1.0.9, the embedded DB is switched to the same Derby DB in Glassfish -->
-         <property name="hibernate.dialect" 
-                   value="GlassfishDerbyDialect"/>
+         <property name="hibernate.dialect" value="GlassfishDerbyDialect"/>
          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
          <property name="hibernate.show_sql" value="true"/>
          <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
-         <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/>
-         <!-- alternative
-         <property name="jboss.entity.manager.factory.jndi.name" 
-              value="java:/jpaBookingEntityManagerFactory"/>
-         -->
+         <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/>         
       </properties>
    </persistence-unit>
 </persistence>

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/rich.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/rich.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/rich.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,546 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
-<namespace>http://richfaces.org/rich</namespace>
-
-<tag>
-  <tag-name>dndParam</tag-name>
-  <component>
-      <component-type>org.richfaces.DndParam</component-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dropSupport</tag-name>
-  <component>
-      <component-type>org.richfaces.DropSupport</component-type>
-      <renderer-type>
-        org.richfaces.DropSupportRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.DropSupportHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>dragIndicator</tag-name>
-  <component>
-      <component-type>org.richfaces.DragIndicator</component-type>
-      <renderer-type>
-        org.richfaces.DragIndicatorRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dragSupport</tag-name>
-  <component>
-      <component-type>org.richfaces.DragSupport</component-type>
-      <renderer-type>
-        org.richfaces.DragSupportRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.DragSupportHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>dropListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DropListenerHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>dragListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DragListenerHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>effect</tag-name>
-  <component>
-      <component-type>org.richfaces.Effect</component-type>
-      <renderer-type>
-        org.richfaces.EffectRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panel</tag-name>
-  <component>
-      <component-type>org.richfaces.panel</component-type>
-      <renderer-type>
-        org.richfaces.PanelRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panelBar</tag-name>
-  <component>
-      <component-type>org.richfaces.PanelBar</component-type>
-      <renderer-type>
-        org.richfaces.PanelBarRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panelBarItem</tag-name>
-  <component>
-      <component-type>org.richfaces.PanelBarItem</component-type>
-      <renderer-type>
-        org.richfaces.PanelBarItemRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataFilterSlider</tag-name>
-  <component>
-      <component-type>org.richfaces.DataFilterSlider</component-type>
-      <renderer-type>
-        org.richfaces.DataFilterSliderRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.DataFilterSliderTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>sliderListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DataFilterSliderListenerTagHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>gmap</tag-name>
-  <component>
-      <component-type>org.richfaces.Gmap</component-type>
-      <renderer-type>
-        org.richfaces.GmapRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>virtualEarth</tag-name>
-  <component>
-      <component-type>org.richfaces.VirtualEarth</component-type>
-      <renderer-type>
-        org.richfaces.VirtualEarthRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>separator</tag-name>
-  <component>
-      <component-type>org.richfaces.separator</component-type>
-      <renderer-type>
-        org.richfaces.SeparatorRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>spacer</tag-name>
-  <component>
-      <component-type>org.richfaces.spacer</component-type>
-      <renderer-type>
-        org.richfaces.SpacerRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>paint2D</tag-name>
-  <component>
-      <component-type>org.richfaces.Paint2D</component-type>
-      <renderer-type>
-        org.richfaces.Paint2DRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.Paint2DTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>togglePanel</tag-name>
-  <component>
-      <component-type>org.richfaces.TogglePanel</component-type>
-      <renderer-type>
-        org.richfaces.TogglePanelRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>toggleControl</tag-name>
-  <component>
-      <component-type>org.richfaces.ToggleControl</component-type>
-      <renderer-type>
-        org.richfaces.ToggleControlRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>tabPanel</tag-name>
-  <component>
-      <component-type>org.richfaces.TabPanel</component-type>
-      <renderer-type>
-        org.richfaces.TabPanelRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.TabPanelTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>tab</tag-name>
-  <component>
-      <component-type>org.richfaces.Tab</component-type>
-      <renderer-type>
-        org.richfaces.TabRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>simpleTogglePanel</tag-name>
-  <component>
-      <component-type>org.richfaces.SimpleTogglePanel</component-type>
-      <renderer-type>
-        org.richfaces.SimpleTogglePanelRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.SimpleTogglePanelTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>toolBar</tag-name>
-  <component>
-      <component-type>org.richfaces.ToolBar</component-type>
-      <renderer-type>
-        org.richfaces.ToolBarRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>toolBarGroup</tag-name>
-  <component>
-      <component-type>org.richfaces.ToolBarGroup</component-type>
-      <renderer-type>
-        org.richfaces.ToolBarGroupRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>inputNumberSlider</tag-name>
-  <component>
-      <component-type>org.richfaces.inputNumberSlider</component-type>
-      <renderer-type>
-        org.richfaces.InputNumberSliderRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>inputNumberSpinner</tag-name>
-  <component>
-      <component-type>org.richfaces.inputNumberSpinner</component-type>
-      <renderer-type>
-        org.richfaces.InputNumberSpinnerRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>tree</tag-name>
-  <component>
-      <component-type>org.richfaces.Tree</component-type>
-      <renderer-type>
-        org.richfaces.TreeRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.TreeTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>treeNode</tag-name>
-  <component>
-      <component-type>org.richfaces.TreeNode</component-type>
-      <renderer-type>
-        org.richfaces.TreeNodeRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.TreeNodeTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>dropListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DropListenerHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>dragListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DragListenerHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>changeExpandListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.ChangeExpandListenerTagHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>nodeSelectListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.NodeSelectListenerTagHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>suggestionbox</tag-name>
-  <component>
-      <component-type>org.richfaces.SuggestionBox</component-type>
-      <renderer-type>
-        org.richfaces.SuggestionBox
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.SuggestionBoxTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>subTable</tag-name>
-  <component>
-      <component-type>org.richfaces.SubTable</component-type>
-      <renderer-type>
-        org.richfaces.SubTableRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>column</tag-name>
-  <component>
-      <component-type>org.richfaces.Column</component-type>
-      <renderer-type>
-        org.richfaces.ColumnRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataList</tag-name>
-  <component>
-      <component-type>org.richfaces.DataList</component-type>
-      <renderer-type>
-        org.richfaces.DataListRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataOrderedList</tag-name>
-  <component>
-      <component-type>org.richfaces.DataOrderedList</component-type>
-      <renderer-type>
-        org.richfaces.DataOrderedListRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataDefinitionList</tag-name>
-  <component>
-      <component-type>org.richfaces.DataDefinitionList</component-type>
-      <renderer-type>
-        org.richfaces.DataDefinitionListRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataGrid</tag-name>
-  <component>
-      <component-type>org.richfaces.DataGrid</component-type>
-      <renderer-type>
-        org.richfaces.DataGridRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dataTable</tag-name>
-  <component>
-      <component-type>org.richfaces.DataTable</component-type>
-      <renderer-type>
-        org.richfaces.DataTableRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>columnGroup</tag-name>
-  <component>
-      <component-type>org.richfaces.ColumnGroup</component-type>
-      <renderer-type>
-        org.richfaces.ColumnGroupRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>modalPanel</tag-name>
-  <component>
-      <component-type>org.richfaces.ModalPanel</component-type>
-      <renderer-type>
-        org.richfaces.ModalPanelRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>datascroller</tag-name>
-  <component>
-      <component-type>org.richfaces.Datascroller</component-type>
-      <renderer-type>
-        org.richfaces.DataScrollerRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.DataScrollerTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>scrollerListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.DataScrollerListenerTagHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>menuGroup</tag-name>
-  <component>
-      <component-type>org.richfaces.MenuGroup</component-type>
-      <renderer-type>
-        org.richfaces.MenuGroupRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>menuItem</tag-name>
-  <component>
-      <component-type>org.richfaces.MenuItem</component-type>
-      <renderer-type>
-        org.richfaces.MenuItemRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>menuSeparator</tag-name>
-  <component>
-      <component-type>org.richfaces.MenuSeparator</component-type>
-      <renderer-type>
-        org.richfaces.MenuSeparatorRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>dropDownMenu</tag-name>
-  <component>
-      <component-type>org.richfaces.DropDownMenu</component-type>
-      <renderer-type>
-        org.richfaces.DropDownMenuRenderer
-      </renderer-type>
-        <handler-class>
-        org.richfaces.taglib.DropDownMenuTagHandler
-      </handler-class>
-  </component>
-  
- </tag><tag>
-  <tag-name>toolTip</tag-name>
-  <component>
-      <component-type>org.richfaces.component.ToolTip</component-type>
-      <renderer-type>
-        org.richfaces.renderkit.html.ToolTipRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panelMenu</tag-name>
-  <component>
-      <component-type>org.richfaces.PanelMenu</component-type>
-      <renderer-type>
-        org.richfaces.PanelMenuRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panelMenuGroup</tag-name>
-  <component>
-      <component-type>org.richfaces.PanelMenuGroup</component-type>
-      <renderer-type>
-        org.richfaces.PanelMenuGroupRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>panelMenuItem</tag-name>
-  <component>
-      <component-type>org.richfaces.PanelMenuItem</component-type>
-      <renderer-type>
-        org.richfaces.PanelMenuItemRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>calendar</tag-name>
-  <component>
-      <component-type>org.richfaces.Calendar</component-type>
-      <renderer-type>
-        org.richfaces.CalendarRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>currentDateChangeListener</tag-name>
-        <handler-class>
-        org.richfaces.taglib.CurrentDateChangeListenerTagHandler
-      </handler-class>
-  
- </tag><tag>
-  <tag-name>treeNodesAdaptor</tag-name>
-  <component>
-      <component-type>org.richfaces.TreeNodesAdaptor</component-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>recursiveTreeNodesAdaptor</tag-name>
-  <component>
-      <component-type>org.richfaces.RecursiveTreeNodesAdaptor</component-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>message</tag-name>
-  <component>
-      <component-type>org.richfaces.component.RichMessage</component-type>
-      <renderer-type>
-        org.richfaces.RichMessageRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>messages</tag-name>
-  <component>
-      <component-type>org.richfaces.component.RichMessages</component-type>
-      <renderer-type>
-        org.richfaces.RichMessagesRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>scrollableDataTable</tag-name>
-  <component>
-      <component-type>org.richfaces.component.ScrollableDataTable</component-type>
-      <renderer-type>
-        org.richfaces.renderkit.html.ScrollableDataTableRenderer
-      </renderer-type>
-  </component>
-  
- </tag><tag>
-  <tag-name>insert</tag-name>
-  <component>
-      <component-type>org.richfaces.ui.Insert</component-type>
-      <renderer-type>
-        org.richfaces.ui.InsertRenderer
-      </renderer-type>
-  </component>
-  
- </tag>
-</facelet-taglib>
\ No newline at end of file

Deleted: trunk/examples/jpa/resources-websphere61/META-INF/s.taglib.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/META-INF/s.taglib.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/META-INF/s.taglib.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet">
-  <namespace>http://jboss.com/products/seam/taglib</namespace>
-
-
-
-    <tag>
-    <tag-name>button</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Button</component-type>
-    	  <renderer-type>org.jboss.seam.ui.ButtonRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>cache</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Cache</component-type>
-    	  <renderer-type>org.jboss.seam.ui.CacheRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>conversationId</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.ConversationId</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>conversationPropagation</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.ConversationPropagation</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>decorate</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Decorate</component-type>
-    	  <renderer-type>org.jboss.seam.ui.DecorateRenderer</renderer-type>
-              <handler-class>org.jboss.seam.ui.handler.DecorateHandler</handler-class>
-        </component>
-  </tag>
-      <tag>
-    <tag-name>div</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Div</component-type>
-    	  <renderer-type>org.jboss.seam.ui.DivRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>enumItem</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.EnumItem</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>fileUpload</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.FileUpload</component-type>
-    	  <renderer-type>org.jboss.seam.ui.FileUploadRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>formattedText</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.FormattedText</component-type>
-    	  <renderer-type>org.jboss.seam.ui.FormattedTextRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>fragment</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Fragment</component-type>
-    	  <renderer-type>org.jboss.seam.ui.FragmentRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>graphicImage</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.graphicImage.GraphicImage</component-type>
-    	  <renderer-type>org.jboss.seam.ui.GraphicImageRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>label</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Label</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>link</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Link</component-type>
-    	  <renderer-type>org.jboss.seam.ui.LinkRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>loadStyle</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.LoadStyle</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>message</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Message</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>selectDate</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.SelectDate</component-type>
-    	  <renderer-type>org.jboss.seam.ui.SelectDateRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>selection</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Selection</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>selectItems</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.SelectItems</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>span</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.Span</component-type>
-    	  <renderer-type>org.jboss.seam.ui.SpanRenderer</renderer-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>taskId</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.TaskId</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>transformImageBlur</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.graphicImage.TransformImageBlur</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>transformImageSize</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.graphicImage.TransformImageSize</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>transformImageType</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.graphicImage.TransformImageType</component-type>
-            </component>
-  </tag>
-      <tag>
-    <tag-name>validateAll</tag-name>
-    <component>
-	  <component-type>org.jboss.seam.ui.ValidateAll</component-type>
-    	  <renderer-type>org.jboss.seam.ui.ValidateAllRenderer</renderer-type>
-            </component>
-  </tag>
-  
-  <tag>
-    <tag-name>validate</tag-name>
-    <validator>
-      <validator-id>org.jboss.seam.ui.ModelValidator</validator-id>
-    </validator>
-  </tag>
-
-  <tag>
-    <tag-name>convertDateTime</tag-name>
-    <converter>
-      <converter-id>org.jboss.seam.ui.DateTimeConverter</converter-id>
-    </converter>
-  </tag>
-  <tag>
-    <tag-name>convertEntity</tag-name>
-    <converter>
-      <converter-id>org.jboss.seam.ui.EntityConverter</converter-id>
-    </converter>
-  </tag>
-  <tag>
-    <tag-name>convertEnum</tag-name>
-    <converter>
-      <converter-id>org.jboss.seam.ui.EnumConverter</converter-id>
-    </converter>
-  </tag>
-
-
-
-</facelet-taglib>
\ No newline at end of file

Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components xmlns="http://jboss.com/products/seam/components"
-            xmlns:core="http://jboss.com/products/seam/core"
-            xmlns:persistence="http://jboss.com/products/seam/persistence"
-            xmlns:transaction="http://jboss.com/products/seam/transaction"
-            xmlns:security="http://jboss.com/products/seam/security"
-            xmlns:web="http://jboss.com/products/seam/web"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation=
-                "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd 
+   xmlns:core="http://jboss.com/products/seam/core"
+   xmlns:persistence="http://jboss.com/products/seam/persistence"
+   xmlns:transaction="http://jboss.com/products/seam/transaction"
+   xmlns:security="http://jboss.com/products/seam/security"
+   xmlns:web="http://jboss.com/products/seam/web"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd 
                  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd 
                  http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+                 http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
                  http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
                  http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
-
-    <core:manager conversation-timeout="120000" 
-                  concurrent-request-timeout="500"
-                  conversation-id-parameter="cid"/>
-                  
-                  
-    <persistence:entity-manager-factory name="bookingDatabase"/>
-    
-    <persistence:managed-persistence-context name="em"
-                               auto-create="true" 
-                    entity-manager-factory="#{bookingDatabase}"/>
-                    
-    <security:identity authenticate-method="#{authenticator.authenticate}"/>  
-    
-    <!-- WAS requires the filter to be mapped to a suffix, so can't use built in Seam filter --> 
-    <web:ajax4jsf-filter disabled="true" />
-    
+   
+   <core:manager conversation-timeout="120000"
+               concurrent-request-timeout="500"
+               conversation-id-parameter="cid"/>
+   
+   <transaction:entity-transaction entity-manager="#{em}"/>
+   
+   <persistence:entity-manager-factory name="bookingDatabase"/>
+   
+   <persistence:managed-persistence-context name="em" auto-create="true"
+                           entity-manager-factory="#{bookingDatabase}"/>
+   
+   <security:identity authenticate-method="#{authenticator.authenticate}"/>
+   
 </components>

Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/web.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/WEB-INF/web.xml	2008-01-28 21:44:12 UTC (rev 7264)
+++ trunk/examples/jpa/resources-websphere61/WEB-INF/web.xml	2008-01-28 21:50:43 UTC (rev 7265)
@@ -4,23 +4,6 @@
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
 http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    
-    
-    <!-- WAS requires the filter to be mapped to a suffix, so can't use built in Seam filter -->
-    <filter> 
-        <display-name>RichFaces Filter</display-name>
-        <filter-name>richfaces</filter-name> 
-        <filter-class>org.ajax4jsf.Filter</filter-class> 
-    </filter> 
-
-    <filter-mapping> 
-        <filter-name>richfaces</filter-name> 
-        <servlet-name>Faces Servlet</servlet-name>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-    
     <!-- Seam -->
     
     <listener>              




More information about the seam-commits mailing list