[jboss-svn-commits] JBL Code SVN: r8463 - in labs/jbossesb/trunk/product: console console/distro console/resources/WEB-INF console/resources/WEB-INF/classes console/resources/WEB-INF/lib console/src/org/jboss/soa/esb/admin/console/exchange console/src/org/jboss/soa/esb/admin/console/transform console/view console/view/contract console/view/participant console/view/transform core/rosetta/tests/resources/etc samples/quickstarts/helloworld_embedded_reg

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 20 17:24:07 EST 2006


Author: tfennelly
Date: 2006-12-20 17:20:46 -0500 (Wed, 20 Dec 2006)
New Revision: 8463

Added:
   labs/jbossesb/trunk/product/console/distro/hsqldb-distro-build.xml
   labs/jbossesb/trunk/product/console/distro/hsqldb-hibernate.cfg.xml
   labs/jbossesb/trunk/product/console/distro/jboss-esb-console-ds.xml
   labs/jbossesb/trunk/product/console/distro/postgres-hibernate.cfg.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/jboss-web.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ajax4jsf.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-logging.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ejb3-persistence.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-annotations.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-entitymanager.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate3.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-archive-browsing.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/oscache-2.3.2.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/navigation.xml
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceList.java
   labs/jbossesb/trunk/product/console/view/transform/smooks-config.jsp
   labs/jbossesb/trunk/product/console/view/transform/update-resource-parameter.xhtml
Removed:
   labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-codec-1.3.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-digester-1.6.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-all.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-aop-jdk50.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-cache-jdk50.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-ejb3-all.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jbpm-3.1.1.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jgroups.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jstl.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/mailstuff.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/mc-conf.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/portlet-api-lib.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/selectitems-1.1.0rc2.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/thirdparty-all.jar
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelected.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelectedInterceptor.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java
Modified:
   labs/jbossesb/trunk/product/console/build.properties
   labs/jbossesb/trunk/product/console/build.xml
   labs/jbossesb/trunk/product/console/distro/distro-build.xml
   labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml
   labs/jbossesb/trunk/product/console/import.sql
   labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/components.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam-debug.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam-ui.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jsf-facelets.jar
   labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml
   labs/jbossesb/trunk/product/console/resources/WEB-INF/web.xml
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/SelectMessageExchange.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java
   labs/jbossesb/trunk/product/console/view/about.xhtml
   labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml
   labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml
   labs/jbossesb/trunk/product/console/view/index.html
   labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml
   labs/jbossesb/trunk/product/console/view/transform/import-resources.xhtml
   labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml
   labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml
   labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-finish.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-from.xhtml
   labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
   labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/persistUnitTestDB.properties
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/esb-config-gateway.xml
Log:
Updated the console app to slim it down + remove the EJB3 and MC dependencies.  Also upgraded to Seam 1.1GA.

Modified: labs/jbossesb/trunk/product/console/build.properties
===================================================================
--- labs/jbossesb/trunk/product/console/build.properties	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/build.properties	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,5 +1,5 @@
-#deploy.dir=/home/tfennelly/jboss-4.0.4.GA/server/default/deploy
-deploy.dir=/home/tfennelly/packages/apache-tomcat-5.5.20/webapps
+deploy.dir=/home/tfennelly/jboss-4.0.4.GA/server/default/deploy
+#deploy.dir=/home/tfennelly/packages/apache-tomcat-5.5.20/webapps
 
 db.host=localhost
 db.port=5432

Modified: labs/jbossesb/trunk/product/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/build.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/build.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -50,21 +50,22 @@
     	<ant target="assertTestsFailed" />
 
     	<!-- Package -->
-    	<copy file="distro/postgres-jboss-beans.xml" tofile="${resources.dir}/WEB-INF/classes/jboss-beans.xml" overwrite="true">
-    		<filterset filtersfile="build.properties" />
-   		</copy>
     	<delete file="${build.console.dir}/${package.name}.war" />
     	<copy todir="${resources.dir}/WEB-INF/lib">
     		<fileset dir="${product.lib.ext.dir}" includes="milyn*.jar" />
    		</copy>
+    	<jar destfile="${resources.dir}/WEB-INF/lib/${package.name}.jar">
+    		<fileset dir="${resources.dir}/WEB-INF/classes" />
+    		<fileset dir="${classes.dir}" />
+    	</jar>
     	<jar destfile="${build.console.dir}/${package.name}.war">
     		<fileset dir="${build.console.dir}" excludes="test/**" />
-    		<fileset dir="${resources.dir}" includes="WEB-INF/**" />
+    		<fileset dir="${resources.dir}" includes="WEB-INF/**" excludes="WEB-INF/classes/**" />
     		<fileset dir="${view.dir}" />
     		<fileset dir="${basedir}" includes="distro/**" />
     		<fileset dir="${basedir}" includes="import.sql" />
     	</jar>
-    	<delete dir="${resources.dir}/WEB-INF/lib" includes="milyn*.jar" />
+    	<delete dir="${resources.dir}/WEB-INF/lib" includes="milyn*.jar,${package.name}.jar" />
     </target>
 
 	<target name="assertTestsFailed" if="test.failed">
@@ -99,7 +100,7 @@
 
 	<path id="src.compile.classpath">
 		<fileset dir="${resources.dir}/WEB-INF/lib" includes="*.jar" />
-		<fileset dir="${product.lib.ext.dir}" includes="milyn*.jar, junit*.jar" />
+		<fileset dir="${product.lib.ext.dir}" includes="*.jar" />
 	</path>
 
 	<path id="test.classpath">

Modified: labs/jbossesb/trunk/product/console/distro/distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/distro-build.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/distro-build.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -10,13 +10,26 @@
 	
 <project name="JBoss ESB Administration Console" default="build" basedir=".">
 
-    <target name="build" description="Package the Jboss ESB Administration Console.">
+    <property name="console-package.name"      value="jboss-esb-console"/>	
 
-    	<!--
-    		We can add support for other database types here - add a section to ask the user which db type they're interested in etc.
-    		For now we just support Postgres.
-    	-->
-    	<ant dir="console/distro" antfile="postgres-distro-build.xml" />
+	<target name="build" description="Package the Jboss ESB Administration Console.">
+		
+    	<delete file="${console-package.name}-ds.xml" />
+    	<delete file="${console-package.name}.war" />
+
+		<echo message="----------------------------------------------------------------------------------------------------------------" />
+		<echo message="|                                                                                                              |" />
+		<echo message="|             J B O S S    E S B    A D M I N I S T R A T I O N    C O N S O L E    C O N F I G                |" />
+		<echo message="|                                                                                                              |" />
+		<echo message="----------------------------------------------------------------------------------------------------------------" />
+		<echo message="" />
+		<echo message="" />
+		<input message="This script will help you configure your JBoss ESB Administration Console Application.  You can reconfigure at any time by re-running this script. ${line.separator}Press enter to start..." />
+		<echo message="" />
+		<input addproperty="db.target" message='Enter the target database type:' defaultvalue="hsqldb" validargs="hsqldb,postgres" />
+		<echo message="" />
+    	    	
+    	<ant dir="console/distro" antfile="${db.target}-distro-build.xml" />
     	
     </target>
 	

Added: labs/jbossesb/trunk/product/console/distro/hsqldb-distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/hsqldb-distro-build.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/hsqldb-distro-build.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!--
+	NOTICE:
+	This file is only used for packaging the console from a release distro.
+-->
+	
+<project name="JBoss ESB Administration Console" default="build" basedir=".">
+
+    <target name="build" description="Capture Postgres DB config from user and package the app.">
+
+    	<copy file="hsqldb-hibernate.cfg.xml" tofile="hibernate.cfg.xml" />
+    	<copy file="../../CONSOLE-import.sql" tofile="import.sql" />
+    	<jar update="true" basedir="." destfile="../WEB-INF/lib/${console-package.name}.jar" includes="hibernate.cfg.xml,import.sql" />
+    	<delete dir="./" includes="hibernate.cfg.xml,import.sql" />
+    	<jar destfile="../../${console-package.name}.war">
+    		<fileset dir="../" excludes="distro/**" />
+    	</jar>
+    </target>
+	
+</project>

Added: labs/jbossesb/trunk/product/console/distro/hsqldb-hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/hsqldb-hibernate.cfg.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/hsqldb-hibernate.cfg.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,23 @@
+<!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="java:/esbDatabase">
+        <property name="show_sql">false</property>
+        <property name="connection.datasource">java:/DefaultDS</property>
+        <property name="hbm2ddl.auto">create-drop</property>
+        <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+        <property name="transaction.flush_before_completion">true</property>
+        <property name="connection.release_mode">after_statement</property>
+        <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+        <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+
+	<mapping class="org.jboss.soa.esb.admin.console.exchange.participant.Participant"/>
+	<mapping class="org.jboss.soa.esb.admin.console.contract.MessageContract"/>
+	<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResource"/>
+	<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceParameter"/>
+	<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceSpec"/>
+	<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceParameterSpec"/>
+    </session-factory>
+</hibernate-configuration>

Added: labs/jbossesb/trunk/product/console/distro/jboss-esb-console-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/jboss-esb-console-ds.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/jboss-esb-console-ds.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+    <local-tx-datasource>
+        <jndi-name>@db.jndiname@</jndi-name>
+        <connection-url>@db.connection.url@</connection-url>
+        <driver-class>@db.driver@</driver-class>
+        <user-name>@db.username@</user-name>
+        <password>@db.password@</password>
+    </local-tx-datasource>
+</datasources>
+

Modified: labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -8,19 +8,8 @@
 	
 <project name="JBoss ESB Administration Console" default="build" basedir=".">
 
-    <property name="package.name"      value="jboss-esb-console"/>
-	
     <target name="build" description="Capture Postgres DB config from user and package the app.">
-
-		<echo message="----------------------------------------------------------------------------------------------------------------" />
-		<echo message="|                                                                                                              |" />
-		<echo message="|             J B O S S    E S B    A D M I N I S T R A T I O N    C O N S O L E    C O N F I G                |" />
-		<echo message="|                                                                                                              |" />
-		<echo message="----------------------------------------------------------------------------------------------------------------" />
-		<echo message="" />
-		<echo message="" />
-		<input message="This script will help you configure your JBoss ESB Administration Console Application.  You can reconfigure at any time by re-running this script. ${line.separator}Press enter to start..." />
-		<echo message="" />
+	
 		<input addproperty="db.host" message='Enter the host address of your Postgres database (for "localhost" simply press return):' defaultvalue="localhost" />
 		<echo message="" />
 		<input addproperty="db.port" message='Enter the host port of your Postgres database (for "5432" simply press return):' defaultvalue="5432" />
@@ -33,16 +22,19 @@
 		<echo message="" />
     	
     	<!-- Package -->
-    	<copy file="postgres-jboss-beans.xml" tofile="../WEB-INF/classes/jboss-beans.xml" overwrite="true">
+    	<copy file="${console-package.name}-ds.xml" todir="../../">
     	    <filterset>
-				<filter token="db.host" value="${db.host}"/>
-			    <filter token="db.port" value="${db.port}"/>
-			    <filter token="db.name" value="${db.name}"/>
+				<filter token="db.jndiname" value="jbossesb-console-Datasource"/>
+				<filter token="db.driver" value="org.postgresql.Driver"/>
+				<filter token="db.connection.url" value="jdbc:postgresql://${db.host}:${db.port}/${db.name}"/>
 			    <filter token="db.username" value="${db.username}"/>
 			    <filter token="db.password" value="${db.password}"/>
     	    </filterset>
     	</copy>
-    	<jar destfile="../../${package.name}.war">
+    	<copy file="postgres-hibernate.cfg.xml" tofile="hibernate.cfg.xml" />
+    	<jar update="true" basedir="." destfile="../WEB-INF/lib/${console-package.name}.jar" includes="hibernate.cfg.xml" />
+    	<delete file="hibernate.cfg.xml" />
+    	<jar destfile="../../${console-package.name}.war">
     		<fileset dir="../" excludes="distro/**" />
     	</jar>
     </target>

Added: labs/jbossesb/trunk/product/console/distro/postgres-hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/postgres-hibernate.cfg.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/postgres-hibernate.cfg.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,24 @@
+<!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="java:/esbDatabase">
+		<property name="show_sql">false</property>
+		<property name="connection.datasource">java:/jbossesb-console-Datasource</property>
+		<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+		<property name="hbm2ddl.auto">update</property>
+		<property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+		<property name="transaction.flush_before_completion">true</property>
+		<property name="connection.release_mode">after_statement</property>
+		<property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+		<property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+		
+		<mapping class="org.jboss.soa.esb.admin.console.exchange.participant.Participant"/>
+		<mapping class="org.jboss.soa.esb.admin.console.contract.MessageContract"/>
+		<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResource"/>
+		<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceParameter"/>
+		<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceSpec"/>
+		<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceParameterSpec"/>
+	</session-factory>
+</hibernate-configuration>

Deleted: labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
-
-   <bean name="TransactionManagerFactory" class="org.jboss.seam.microcontainer.TransactionManagerFactory"/>
-   <bean name="TransactionManager" class="java.lang.Object">
-      <constructor factoryMethod="getTransactionManager">
-         <factory bean="TransactionManagerFactory"/>
-      </constructor>
-   </bean>
-
-   <bean name="esbDatasourceFactory" class="org.jboss.seam.microcontainer.DataSourceFactory">
-      <property name="driverClass">org.postgresql.Driver</property>
-      <property name="connectionUrl">jdbc:postgresql://@db.host@:@db.port@/@db.name@</property>
-      <property name="userName">@db.username@</property>
-      <property name="password">@db.password@</property>
-      <property name="jndiName">java:/hibernateDatasource</property>
-      <property name="minSize">0</property>
-      <property name="maxSize">10</property>
-      <property name="blockingTimeout">1000</property>
-      <property name="idleTimeout">100000</property>
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-   </bean>
-   <bean name="esbDatasource" class="java.lang.Object">
-      <constructor factoryMethod="getDataSource">
-         <factory bean="esbDatasourceFactory"/>
-      </constructor>
-   </bean>
-   
-   <bean name="esbDatabaseFactory" class="org.jboss.seam.microcontainer.HibernateFactory"/>
-   <bean name="esbDatabase" class="java.lang.Object">
-      <constructor factoryMethod="getSessionFactory">
-         <factory bean="esbDatabaseFactory"/>
-      </constructor>
-      <depends>esbDatasource</depends>
-   </bean>
-
-</deployment>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/console/import.sql
===================================================================
--- labs/jbossesb/trunk/product/console/import.sql	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/import.sql	2006-12-20 22:20:46 UTC (rev 8463)
@@ -16,197 +16,113 @@
 --########################################################################
 --#  Sample Message Contracts.
 --########################################################################
-INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES 
-	(1, 'DVDStore:OrderDispatchService', 'PRODUCES', 'text/xml', 'fullFillOrder', 'http://org.acme/OrderDispatchService/fullFillOrder.xsd');
-INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES 
-	(2, 'DVDWarehouse_1:OrderHandlingService', 'CONSUMES', 'text/xml', 'shipOrder', 'http://org.acme/OrderHandlingService/shipOrder-post.dtd');
-INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES 
-	(3, 'DVDWarehouse_2:OrderNotificationService', 'CONSUMES', 'application/EDI-X12', 'notifyCustomer', 'http://org.acme/OrderHandlingService/notifyCustomer.xsd');
-INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES 
-	(4, 'DataWarehouse:OrderTrackingService', 'CONSUMES', 'text/xml', 'recordOrder', 'http://org.acme/OrderTrackingService/recordOrder.xsd');
+INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES (1, 'DVDStore:OrderDispatchService', 'PRODUCES', 'text/xml', 'fullFillOrder', 'http://org.acme/OrderDispatchService/fullFillOrder.xsd');
+INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES (2, 'DVDWarehouse_1:OrderHandlingService', 'CONSUMES', 'text/xml', 'shipOrder', 'http://org.acme/OrderHandlingService/shipOrder-post.dtd');
+INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES (3, 'DVDWarehouse_2:OrderNotificationService', 'CONSUMES', 'application/EDI-X12', 'notifyCustomer', 'http://org.acme/OrderHandlingService/notifyCustomer.xsd');
+INSERT INTO messagecontract (id, participant, usage, mime, namespace, messagedescription) VALUES (4, 'DataWarehouse:OrderTrackingService', 'CONSUMES', 'text/xml', 'recordOrder', 'http://org.acme/OrderTrackingService/recordOrder.xsd');
 
 --########################################################################
 --#  Templating cdu-creators.
 --########################################################################
-insert into transformationresource (id, name, path, selector, useragent) values 
-	(1, '* XSLT Content Delivery Unit Creator (This resource is targeted at all Message Exchanges and is required for interpreting "xsl" resource types)', 'org.milyn.templating.xslt.XslContentDeliveryUnitCreator', 'cdu-creator', '*');
-insert into transformationresourceparameter (id, name, value, transresource_id) values 
-	(1, 'restype', 'xsl', 1);
+insert into transformationresource (id, name, path, selector, useragent) values (1, '* XSLT Content Delivery Unit Creator (This resource is targeted at all Message Exchanges and is required for interpreting "xsl" resource types)', 'org.milyn.templating.xslt.XslContentDeliveryUnitCreator', 'cdu-creator', '*');
+insert into transformationresourceparameter (id, name, value, transresource_id) values (1, 'restype', 'xsl', 1);
 
-insert into transformationresource (id, name, path, selector, useragent) values 
-	(2, '* StringTemplate Content Delivery Unit Creator (This resource is targeted at all Message Exchanges and is required for interpreting "st" resource types)', 'org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator', 'cdu-creator', '*');
-insert into transformationresourceparameter (id, name, value, transresource_id) values 
-	(2, 'restype', 'st', 2);
+insert into transformationresource (id, name, path, selector, useragent) values (2, '* StringTemplate Content Delivery Unit Creator (This resource is targeted at all Message Exchanges and is required for interpreting "st" resource types)', 'org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator', 'cdu-creator', '*');
+insert into transformationresourceparameter (id, name, value, transresource_id) values (2, 'restype', 'st', 2);
 
 --########################################################################
 --#  XSLT Templatelet Resource Template.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(1, 'XSLT (Templatelet)', 'See ''resdata'' parameter value', 
-	'Perform an XML Fragment Transform using an XSLT Templatelet.  The targeted XML fragment is transformed using the XSLT Templatelet and the transformation result is used in accordance with the value of the "action" parameter.  Can be used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a> Cartridge.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating Cartridge</a> to be installed.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/xslt/XslContentDeliveryUnitCreator.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(1, 'resdata', '', 'Resource Data.  The XSLT Templatelet code.  Just define the body of the xsl <template> - no need for the outer &lt;stylesheet&gt; or &lt;template&gt; tags.', true, 1);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(2, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 1);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(3, 'restype', 'xsl', 'Resource Type.', false, 1);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(4, 'is-xslt-templatelet', 'true', 'Is this XSLT resource an XSLT Templatelet.', false, 1);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(5, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 1);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(6, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 1);
+insert into transformationresourcespec (id, name, path, description, reference) values (1, 'XSLT (Templatelet)', 'See ''resdata'' parameter value', 'Perform an XML Fragment Transform using an XSLT Templatelet.  The targeted XML fragment is transformed using the XSLT Templatelet and the transformation result is used in accordance with the value of the "action" parameter.  Can be used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a> Cartridge.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating Cartridge</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/xslt/XslContentDeliveryUnitCreator.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (1, 'resdata', '', 'Resource Data.  The XSLT Templatelet code.  Just define the body of the xsl <template> - no need for the outer &lt;stylesheet&gt; or &lt;template&gt; tags.', true, 1);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (2, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 1);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (3, 'restype', 'xsl', 'Resource Type.', false, 1);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (4, 'is-xslt-templatelet', 'true', 'Is this XSLT resource an XSLT Templatelet.', false, 1);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (5, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 1);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (6, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 1);
 
 --########################################################################
 --#  StringTemplate Resource Template.
 --########################################################################
-insert into transformationresourcespec (id, name, description, reference) values 
-	(2, 'StringTemplate', 
-	'Perform an XML Fragment Transform using an <a href="http://www.stringtemplate.org">StringTemplate</a> Template.  The targeted XML fragment is transformed using the <a href="http://www.stringtemplate.org">StringTemplate</a> Template and the transformation result is used in accordance with the value of the "action" parameter.  Used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a>.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating and Javabean Cartridges</a> to be installed.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/stringtemplate/StringTemplateContentDeliveryUnitCreator.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(7, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 2);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(8, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 2);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(9, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 2);
+insert into transformationresourcespec (id, name, description, reference) values (2, 'StringTemplate', 'Perform an XML Fragment Transform using an <a href="http://www.stringtemplate.org">StringTemplate</a> Template.  The targeted XML fragment is transformed using the <a href="http://www.stringtemplate.org">StringTemplate</a> Template and the transformation result is used in accordance with the value of the "action" parameter.  Used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a>.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating and Javabean Cartridges</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/stringtemplate/StringTemplat!
 eContentDeliveryUnitCreator.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (7, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 2);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (8, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 2);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (9, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 2);
 
 
 --########################################################################
 --#  CSV Message Parser Template.
 --########################################################################
-insert into transformationresourcespec (id, name, path, selector, description, reference) values 
-	(3, 'CSV Message Parser', 'org.milyn.csv.CSVParser', 'org.xml.sax.driver',
-	'Set the SAX Parser for a Comma Separated Value (CSV) message.  This resource sets the Smooks SAX Parser for the targeted CSV message, allowing the CSV message to be interpretted as an XML DOM.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks CSV Cartridge</a> to be installed.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/csv/org/milyn/csv/CSVParser.html');
-insert into transformationresourceparameterspec (id, name, value, type, description, required, resourcespec_id) values 
-	(10, 'fields', '', 'string-list', 'Comma Separated list of field names that map to the CSV fields expected in the message.  This field names are mapped to the element names in the DOM produced by this parser.  See Reference docs.', true, 3);
+insert into transformationresourcespec (id, name, path, selector, description, reference) values (3, 'CSV Message Parser', 'org.milyn.csv.CSVParser', 'org.xml.sax.driver', 'Set the SAX Parser for a Comma Separated Value (CSV) message.  This resource sets the Smooks SAX Parser for the targeted CSV message, allowing the CSV message to be interpretted as an XML DOM.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks CSV Cartridge</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/csv/org/milyn/csv/CSVParser.html');
+insert into transformationresourceparameterspec (id, name, value, type, description, required, resourcespec_id) values (10, 'fields', '', 'string-list', 'Comma Separated list of field names that map to the CSV fields expected in the message.  This field names are mapped to the element names in the DOM produced by this parser.  See Reference docs.', true, 3);
 
 
 --########################################################################
 --#  Message Exchange Parameter
 --########################################################################
-insert into transformationresourcespec (id, name, path, selector, description, reference) values 
-	(4, 'Message Exchange Parameter', 'N/A', 'device-parameters',
-	'Set a Message Exchange specific parameter/property value.  This parameter value will be accessible to all <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/ElementVisitor.html">ElementVisitor</a> derived resource instances via the <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/cdr/ParameterAccessor.html">ParameterAccessor</a> class.  This allows you to configure parameters that cut across message profiles.', 
-	'http://milyn.codehaus.org/javadoc/smooks/org/milyn/cdr/ParameterAccessor.html');
-insert into transformationresourceparameterspec (id, value, description, required, resourcespec_id) values 
-	(11, '', 'Parameter Name and Value.', false, 4);
+insert into transformationresourcespec (id, name, path, selector, description, reference) values (4, 'Message Exchange Parameter', 'N/A', 'device-parameters', 'Set a Message Exchange specific parameter/property value.  This parameter value will be accessible to all <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/ElementVisitor.html">ElementVisitor</a> derived resource instances via the <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/cdr/ParameterAccessor.html">ParameterAccessor</a> class.  This allows you to configure parameters that cut across message profiles.', 	'http://milyn.codehaus.org/javadoc/smooks/org/milyn/cdr/ParameterAccessor.html');
+insert into transformationresourceparameterspec (id, value, description, required, resourcespec_id) values (11, '', 'Parameter Name and Value.', false, 4);
 
 
 --########################################################################
 --#  JavaBean Populators
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(5, 'JavaBean Create - Assembly Phase', 'org.milyn.javabean.AssemblyPhaseBeanPopulator', 
-	'Create a JavaBean instance for population with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Assembly Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(12, 'beanId', 'Bean Identifier.', true, 5);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(13, 'beanClass', 'Bean Class Name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 5);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(14, 'addToList', 'Accumulate multiple bean instances (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 5);
+insert into transformationresourcespec (id, name, path, description, reference) values (5, 'JavaBean Create - Assembly Phase', 'org.milyn.javabean.AssemblyPhaseBeanPopulator', 'Create a JavaBean instance for population with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Assembly Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (12, 'beanId', 'Bean Identifier.', true, 5);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (13, 'beanClass', 'Bean Class Name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 5);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (14, 'addToList', 'Accumulate multiple bean instances (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 5);
 
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(6, 'JavaBean Create - Processing Phase', 'org.milyn.javabean.ProcessingPhaseBeanPopulator', 
-	'Create a JavaBean instance for population with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Processing Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(15, 'beanId', 'Bean Identifier.', true, 6);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(16, 'beanClass', 'Bean Class Name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 6);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(17, 'addToList', 'Accumulate multiple bean instances (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 6);
+insert into transformationresourcespec (id, name, path, description, reference) values (6, 'JavaBean Create - Processing Phase', 'org.milyn.javabean.ProcessingPhaseBeanPopulator', 'Create a JavaBean instance for population with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Processing Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 	'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (15, 'beanId', 'Bean Identifier.', true, 6);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (16, 'beanClass', 'Bean Class Name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 6);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (17, 'addToList', 'Accumulate multiple bean instances (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 6);
 
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(7, 'JavaBean Populate - Assembly Phase', 'org.milyn.javabean.AssemblyPhaseBeanPopulator', 
-	'Populate a JavaBean instance with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Assembly Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(18, 'beanId', 'Bean Identifier.', true, 7);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(19, 'setterName', 'Explicitly specify the bean setter method name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 7);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(20, 'attributeName', 'DOM Element attribute name - for extracting a value from a DOM Element attribute (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 7);
+insert into transformationresourcespec (id, name, path, description, reference) values (7, 'JavaBean Populate - Assembly Phase', 'org.milyn.javabean.AssemblyPhaseBeanPopulator', 'Populate a JavaBean instance with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Assembly Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (18, 'beanId', 'Bean Identifier.', true, 7);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (19, 'setterName', 'Explicitly specify the bean setter method name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 7);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (20, 'attributeName', 'DOM Element attribute name - for extracting a value from a DOM Element attribute (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 7);
 
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(8, 'JavaBean Populate - Processing Phase', 'org.milyn.javabean.ProcessingPhaseBeanPopulator', 
-	'Populate a JavaBean instance with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Processing Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(21, 'beanId', 'Bean Identifier.', true, 8);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(22, 'setterName', 'Explicitly specify the bean setter method name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 8);
-insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values 
-	(23, 'attributeName', 'DOM Element attribute name - for extracting a value from a DOM Element attribute (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 8);
+insert into transformationresourcespec (id, name, path, description, reference) values (8, 'JavaBean Populate - Processing Phase', 'org.milyn.javabean.ProcessingPhaseBeanPopulator', 'Populate a JavaBean instance with data from an XML message during the message processing <a href="http://milyn.codehaus.org/javadoc/smooks/org/milyn/delivery/SmooksXML.html">Processing Phase</a>.  The populated beans can be used in XSLT and StringTemplate transformation (see <a href="http://milyn.codehaus.org/Tutorials">Smooks Templating Tutorials</a>).  The populated beans <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/HashMap.html">HasMap</a> is also set on the Message Body (key="EXTRACTED_BEANS_HASH"), allowing them to be accessed by downstream action processors.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AbstractBeanPopulator.html');
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (21, 'beanId', 'Bean Identifier.', true, 8);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (22, 'setterName', 'Explicitly specify the bean setter method name (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 8);
+insert into transformationresourceparameterspec (id, name, description, required, resourcespec_id) values (23, 'attributeName', 'DOM Element attribute name - for extracting a value from a DOM Element attribute (see <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/AssemblyPhaseBeanPopulator.html">Javadoc</a>).', false, 8);
 
 
 --########################################################################
 --#  XSLT Templatelet Resource Template.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(9, 'XSLT (Full Stylesheet)', 'See ''resdata'' parameter value', 
-	'Perform an XML Fragment Transform using a fully XSLT Stylesheet.  The targeted XML fragment is transformed using the XSLT Stylesheet and the transformation result is used in accordance with the value of the "action" parameter.  Can be used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a> Cartridge.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating Cartridge</a> to be installed.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/xslt/XslContentDeliveryUnitCreator.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(24, 'resdata', '', 'Resource Data.  The XSLT Stylesheet.', true, 9);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(25, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 9);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(26, 'restype', 'xsl', 'Resource Type.', false, 9);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(27, 'is-xslt-templatelet', 'false', 'Is this XSLT resource an XSLT Templatelet.', false, 9);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(28, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 9);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(29, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 9);
+insert into transformationresourcespec (id, name, path, description, reference) values (9, 'XSLT (Full Stylesheet)', 'See ''resdata'' parameter value', 'Perform an XML Fragment Transform using a fully XSLT Stylesheet.  The targeted XML fragment is transformed using the XSLT Stylesheet and the transformation result is used in accordance with the value of the "action" parameter.  Can be used in conjunction with the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Javabean Cartridge</a> Cartridge.  <p/>Examples of using this resource can be seen on the <a href="http://milyn.codehaus.org/Tutorials">Milyn Smooks</a> website.<p/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Templating Cartridge</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/xslt/XslContentDeliveryUnitCreator.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (24, 'resdata', '', 'Resource Data.  The XSLT Stylesheet.', true, 9);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (25, 'action', '', 'Action to be performed with the transformation result relative to the targeted XML Fragment.  Possible values: "replace", "addto", "insertbefore", "insertafter".', true, 9);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (26, 'restype', 'xsl', 'Resource Type.', false, 9);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (27, 'is-xslt-templatelet', 'false', 'Is this XSLT resource an XSLT Templatelet.', false, 9);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (28, 'visitBefore', 'false', 'Should the template be applied before (true) or after (false) Smooks visits the child elements of the target element.', false, 9);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (29, 'encoding', 'UTF-8', 'XSLT Character Encoding.', false, 9);
 
 --########################################################################
 --#  Rename Element.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(10, 'Rename Element', 'org.milyn.cdres.trans.RenameElementTU', 
-	'Rename Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.', 
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RenameElementTU.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(30, 'replacementElement', '', 'New name for the element.', true, 10);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(31, 'keepChildContent', '', 'Copy the target element child content to the replacement element.<br/>Default is "true".', false, 10);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(32, 'keepAttributes', '', 'Copy the target element attributes to the replacement element.<br/>Default is "true".', false, 10);
+insert into transformationresourcespec (id, name, path, description, reference) values (10, 'Rename Element', 'org.milyn.cdres.trans.RenameElementTU', 'Rename Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RenameElementTU.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (30, 'replacementElement', '', 'New name for the element.', true, 10);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (31, 'keepChildContent', '', 'Copy the target element child content to the replacement element.<br/>Default is "true".', false, 10);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (32, 'keepAttributes', '', 'Copy the target element attributes to the replacement element.<br/>Default is "true".', false, 10);
 
 --########################################################################
 --#  Set Attribute.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(11, 'Set Attribute', 'org.milyn.cdres.trans.SetAttributeTU', 
-	'Set Element Attribute.  Allows you add/overwrite an attribute on the target Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.',
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/SetAttributeTU.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(33, 'attributeName', '', 'New attribute name.', true, 11);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(34, 'attributeValue', '', 'Attribute Value.', true, 11);
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(35, 'overwrite', '', 'Overwrite existing attributes of the same name.<br/>Default is "false".', false, 11);
+insert into transformationresourcespec (id, name, path, description, reference) values (11, 'Set Attribute', 'org.milyn.cdres.trans.SetAttributeTU', 'Set Element Attribute.  Allows you add/overwrite an attribute on the target Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.','http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/SetAttributeTU.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (33, 'attributeName', '', 'New attribute name.', true, 11);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (34, 'attributeValue', '', 'Attribute Value.', true, 11);
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (35, 'overwrite', '', 'Overwrite existing attributes of the same name.<br/>Default is "false".', false, 11);
 
 --########################################################################
 --#  Remove Element.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(12, 'Remove Element', 'org.milyn.cdres.trans.RemoveElementTU', 
-	'Remove Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.',
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RemoveElementTU.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(36, 'keepChildContent', '', 'Keep the target element''s child content.<br/>Default is "true".', false, 12);
+insert into transformationresourcespec (id, name, path, description, reference) values (12, 'Remove Element', 'org.milyn.cdres.trans.RemoveElementTU', 'Remove Element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.','http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RemoveElementTU.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (36, 'keepChildContent', '', 'Keep the target element''s child content.<br/>Default is "true".', false, 12);
 
 --########################################################################
 --#  Remove Attribute.
 --########################################################################
-insert into transformationresourcespec (id, name, path, description, reference) values 
-	(13, 'Remove Attribute', 'org.milyn.cdres.trans.RemoveAttributeTU', 
-	'Remove an attribute from the target element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.',
-	'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RemoveAttributeTU.html');
-insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values 
-	(37, 'attributeName', '', 'The name of the attribute to be removed from the target element.', true, 13);
+insert into transformationresourcespec (id, name, path, description, reference) values (13, 'Remove Attribute', 'org.milyn.cdres.trans.RemoveAttributeTU', 'Remove an attribute from the target element.<br/>Resources derived from this template will require the <a href="http://milyn.codehaus.org/Smooks#Smooks-smookscartridges">Smooks Misc Cartridge</a> to be installed.', 'http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RemoveAttributeTU.html');
+insert into transformationresourceparameterspec (id, name, value, description, required, resourcespec_id) values (37, 'attributeName', '', 'The name of the attribute to be removed from the target element.', true, 13);

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -5,7 +5,7 @@
 <hibernate-configuration>
 	<session-factory name="java:/esbDatabase">
 		<property name="show_sql">false</property>
-		<property name="connection.datasource">java:/hibernateDatasource</property>
+		<property name="connection.datasource">java:/jbossesb-console-Datasource</property>
 		<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
 		<property name="hbm2ddl.auto">update</property>
 		<property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/components.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/components.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/components.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,20 +1,22 @@
-<components>
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+            xmlns:core="http://jboss.com/products/seam/core"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation=
+                "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd 
+                 http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
 
-    <component name="org.jboss.seam.core.init">
-        <property name="myFacesLifecycleBug">false</property>
-        <property name="debug">true</property>
-    </component>
+    <core:init debug="true"/>    
 
-    <!-- 1200 second conversation timeout -->
-    <component name="org.jboss.seam.core.manager">
-        <property name="conversationTimeout">1200000</property>
-    </component>
+    <core:pages no-conversation-view-id="/home.xhtml"/>
+
+    <core:manager conversation-timeout="1200000" 
+                  concurrent-request-timeout="500"
+                  conversation-id-parameter="cid"
+                  conversation-is-long-running-parameter="clr"/>
+                  
+    <core:hibernate-session-factory name="hibernateSessionFactory"/>
     
-    <!-- Bootstrap Hibernate -->
-    <component name="esbDatabase" 
-              class="org.jboss.seam.core.ManagedHibernateSession"/>
-    <component class="org.jboss.seam.core.Hibernate"/> 
+    <core:managed-hibernate-session name="esbDatabase"/>
     
-    <component class="org.jboss.seam.core.Microcontainer" installed="true"/>
-    
-</components>
\ No newline at end of file
+</components>

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -5,148 +5,10 @@
     
 <faces-config>
 
-    <!-- Navigation rules for the Admin Console app -->
-
-    <navigation-rule>
-
-        <navigation-case>
-            <from-outcome>home</from-outcome>
-            <to-view-id>/home.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>error</from-outcome>
-            <to-view-id>/error.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-		<!-- ==============================================================================================
-			Message Transformation Config View navigation rules.
-		=============================================================================================== -->
-
-        <navigation-case>
-            <from-outcome>select-message-exchange</from-outcome>
-            <to-view-id>/transform/select-message-exchange-from.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>select-message-exchange-from</from-outcome>
-            <to-view-id>/transform/select-message-exchange-from.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>select-message-exchange-to</from-outcome>
-            <to-view-id>/transform/select-message-exchange-to.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>select-message-exchange-finish</from-outcome>
-            <to-view-id>/transform/select-message-exchange-finish.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>new-trans-resource-select-spec</from-outcome>
-            <to-view-id>/transform/new-trans-resource-select-spec.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>add-resource-parameter</from-outcome>
-            <to-view-id>/transform/add-resource-parameter.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>new-trans-resource-create</from-outcome>
-            <to-view-id>/transform/new-trans-resource-create.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>new-trans-resource-target</from-outcome>
-            <to-view-id>/transform/new-trans-resource-target.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>new-trans-resource-spec-create</from-outcome>
-            <to-view-id>/transform/new-trans-resource-spec-create.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>list-resource-specs</from-outcome>
-            <to-view-id>/transform/list-resource-specs.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>list-resources</from-outcome>
-            <to-view-id>/transform/list-resources.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>view-resource</from-outcome>
-            <to-view-id>/transform/view-resource.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>smooks-config</from-outcome>
-            <to-view-id>/transform/smooks-config.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>import-resources</from-outcome>
-            <to-view-id>/transform/import-resources.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-        
-		<!-- ==============================================================================================
-			Message Contract Config View navigation rules.
-		=============================================================================================== -->
-
-        <navigation-case>
-            <from-outcome>new-message-contract</from-outcome>
-            <to-view-id>/contract/new-message-contract.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>list-message-contracts</from-outcome>
-            <to-view-id>/contract/list-message-contracts.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-        <navigation-case>
-            <from-outcome>manage-participants</from-outcome>
-            <to-view-id>/participant/manage-participants.xhtml</to-view-id>
-            <redirect />
-        </navigation-case>
-
-    </navigation-rule>
-
-	<navigation-rule>
-		<from-view-id>/home.xhtml</from-view-id>
-	</navigation-rule>
-
-    <!-- Facelets support -->
-
-    <application>
-        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-    </application>
-    
-    <!-- Select one of the two standard persistence lifecycle models for the Seam application -->
-
     <lifecycle>
-        <phase-listener>org.jboss.seam.jsf.SeamExtendedManagedPersistencePhaseListener</phase-listener>
+      <phase-listener>
+        org.jboss.seam.jsf.TransactionalSeamPhaseListener
+      </phase-listener>
     </lifecycle>
 	
 	<converter>

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/jboss-web.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/jboss-web.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,6 @@
+<jboss-web>
+   <context-root>jboss-esb-console</context-root>
+   <class-loading> 
+      <loader-repository>seam.jboss.org:loader=jboss-esb-console</loader-repository> 
+   </class-loading>
+</jboss-web> 

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ajax4jsf.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ajax4jsf.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-codec-1.3.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-digester-1.6.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ejb3-persistence.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/ejb3-persistence.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-all.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-annotations.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-entitymanager.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate-entitymanager.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate3.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/hibernate3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-archive-browsing.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-archive-browsing.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-cache-jdk50.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-ejb3-all.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam-debug.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam-ui.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jboss-seam.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jbpm-3.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jgroups.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jsf-facelets.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/mailstuff.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/mc-conf.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/oscache-2.3.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/oscache-2.3.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/selectitems-1.1.0rc2.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/lib/thirdparty-all.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/console/resources/WEB-INF/navigation.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/navigation.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/navigation.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config 
+    PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+    "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+    
+<faces-config>
+
+    <!-- Navigation rules for the Admin Console app -->
+
+    <navigation-rule>
+
+        <navigation-case>
+            <from-outcome>home</from-outcome>
+            <to-view-id>/home.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>error</from-outcome>
+            <to-view-id>/error.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+		<!-- ==============================================================================================
+			Message Transformation Config View navigation rules.
+		=============================================================================================== -->
+
+        <navigation-case>
+            <from-outcome>select-message-exchange</from-outcome>
+            <to-view-id>/transform/select-message-exchange-from.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>select-message-exchange-from</from-outcome>
+            <to-view-id>/transform/select-message-exchange-from.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>select-message-exchange-to</from-outcome>
+            <to-view-id>/transform/select-message-exchange-to.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>select-message-exchange-finish</from-outcome>
+            <to-view-id>/transform/select-message-exchange-finish.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>new-trans-resource-select-spec</from-outcome>
+            <to-view-id>/transform/new-trans-resource-select-spec.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>add-resource-parameter</from-outcome>
+            <to-view-id>/transform/add-resource-parameter.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>new-trans-resource-create</from-outcome>
+            <to-view-id>/transform/new-trans-resource-create.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>new-trans-resource-target</from-outcome>
+            <to-view-id>/transform/new-trans-resource-target.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>new-trans-resource-spec-create</from-outcome>
+            <to-view-id>/transform/new-trans-resource-spec-create.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>list-resource-specs</from-outcome>
+            <to-view-id>/transform/list-resource-specs.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>list-resources</from-outcome>
+            <to-view-id>/transform/list-resources.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>view-resource</from-outcome>
+            <to-view-id>/transform/view-resource.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>update-resource-parameter</from-outcome>
+            <to-view-id>/transform/update-resource-parameter.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>smooks-config</from-outcome>
+            <to-view-id>/transform/smooks-config.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>import-resources</from-outcome>
+            <to-view-id>/transform/import-resources.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+        
+		<!-- ==============================================================================================
+			Message Contract Config View navigation rules.
+		=============================================================================================== -->
+
+        <navigation-case>
+            <from-outcome>new-message-contract</from-outcome>
+            <to-view-id>/contract/new-message-contract.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>list-message-contracts</from-outcome>
+            <to-view-id>/contract/list-message-contracts.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+        <navigation-case>
+            <from-outcome>manage-participants</from-outcome>
+            <to-view-id>/participant/manage-participants.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
+    </navigation-rule>
+
+	<navigation-rule>
+		<from-view-id>/home.xhtml</from-view-id>
+	</navigation-rule>
+	
+</faces-config>

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,13 +1,17 @@
+<!DOCTYPE pages PUBLIC
+  "-//JBoss/Seam Pages Configuration DTD 1.1//EN"
+  "http://jboss.com/products/seam/pages-1.1.dtd">
+
 <pages>
 	<!-- Make sure that the Message Exchange gets initialised... -->
-	<page view-id="/transform/select-message-exchange-from.xhtml" action="#{messageExchangeSelect.initialise}"/>
+	<page view-id="/transform/select-message-exchange-from.xhtml" action="#{messageExchangeSelect.initialise}" />
 
 	<!-- Make sure newResource gets initialised... -->
-	<page view-id="/transform/new-trans-resource-select-spec.xhtml" action="#{newResource.initialise}"/>
+	<page view-id="/transform/new-trans-resource-select-spec.xhtml" action="#{newResource.initialise}" />
 
 	<!-- Make sure manageResources gets initialised... -->
-	<page view-id="/transform/list-resources.xhtml" action="#{manageResources.initialise}"/>
+	<page view-id="/transform/list-resources.xhtml" action="#{manageResources.initialise}" />
 
 	<!-- Support GET requests for the configuration data i.e. the ESB reading the configurations... -->
-	<page view-id="/transform/smooks-config.xhtml" action="#{listAllResources.list}"/>
+	<page view-id="/transform/smooks-config.xhtml" action="#{listAllResources.list}" />
 </pages>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/web.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/web.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,67 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" 
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    
-    <!-- Seam -->
-   
-    <listener>
-        <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
-    </listener>
-    
-    <!-- Propagate conversations across redirects -->
-    <filter>
-        <filter-name>Seam Redirect Filter</filter-name>
-        <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-        <filter-name>Seam Redirect Filter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-
-    <!-- Needed to ensure safe tx cleanup when using Seam-managed sessions/persistence contexts -->
-    <filter>
-        <filter-name>Seam Exception Filter</filter-name>
-        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-        <filter-name>Seam Exception Filter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping> 
-    
-    <!-- MyFaces -->
-    
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
-    
-    <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>facelets.DEVELOPMENT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-        <param-value>.xhtml</param-value>
-    </context-param>
-    
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
<web-app>   
      
    <context-param>      
      <param-name>javax.faces.CONFIG_FILES</param-name>      
      <param-value>/WEB-INF/navigation.xml</param-value>   
    </context-param>	   
    
    <!-- Ajax4jsf (must come first!) -->		   
    <filter>     
      <display-name>Ajax4jsf Filter</display-name>     
      <filter-name>ajax4jsf</filter-name>     
      <filter-class>org.ajax4jsf.Filter</filter-class>   
    </filter>	   
    <filter-mapping>     
      <filter-name>ajax4jsf</filter-name>     
      <url-pattern>*.seam</url-pattern>   
    </filter-mapping>   
    <context-param>     
      <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>     
      <param-value>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</param-value>   
    </context-param>
    
    <!-- Seam -->           
    <listener>              
      <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>        
    </listener>    
    <!-- Propagate conversations across redirects -->    
    <filter>        
      <filter-name>Seam Redirect Filter</filter-name>        
      <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>    
    </filter>        
    <filter-mapping>        
      <filter-name>Seam Redirect Filter</filter-name>        
      <url-pattern>*.seam</url-pattern>    
    </filter-mapping>    
    <filter>        
      <filter-name>Seam Exception Filter</filter-name>        
      <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>    
    </filter>        
    <filter-mapping>        
      <filter-name>Seam Exception Filter</filter-name>        
      <url-pattern>*.seam</url-pattern>    
    </filter-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>    
    <!-- Faces Servlet Mapping -->    
    <servlet-mapping>              
      <servlet-name>Faces Servlet</servlet-name>              
      <url-pattern>*.seam</url-pattern>        
    </servlet-mapping>
    <!-- JSF parameters -->  
    <context-param>              
      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>              
      <param-value>client</param-value>        
    </context-param>    
    <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>  
    
    <!-- MyFaces -->    
    <listener>        
      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>    
    </listener>     
    
</web-app>

Deleted: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelected.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelected.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelected.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated 
- * by the @authors tag. All rights reserved. 
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors. 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.admin.console.exchange;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.interceptor.Interceptors;
-
-/**
- * Meta-annotation for the {@link org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelectedInterceptor}
- * interceptor class.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
- at Target(TYPE)
- at Retention(RUNTIME)
- at Inherited
- at Interceptors(MessageExchangeSelectedInterceptor.class)
-public @interface MessageExchangeSelected {
-	
-	/**
-	 * The view Id to be retuened to after making the message exchange selection.
-	 * @return View Id to be retuened to.
-	 */
-	String returnId() default "home";
-}

Deleted: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelectedInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelectedInterceptor.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelectedInterceptor.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated 
- * by the @authors tag. All rights reserved. 
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors. 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.admin.console.exchange;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-import org.jboss.seam.annotations.Around;
-import org.jboss.seam.interceptors.BijectionInterceptor;
-import org.jboss.seam.interceptors.BusinessProcessInterceptor;
-import org.jboss.seam.interceptors.ConversationInterceptor;
-import org.jboss.seam.interceptors.ValidationInterceptor;
-import org.jboss.soa.esb.admin.console.SeamViewIdStack;
-
-/**
- * Interceptor to enforce Message exchange selection.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
- at Around( { BijectionInterceptor.class, ValidationInterceptor.class, ConversationInterceptor.class, BusinessProcessInterceptor.class })
-public class MessageExchangeSelectedInterceptor {
-
-	@AroundInvoke
-	public Object assertExchangeSelected(InvocationContext invocation) throws Exception {
-		boolean isExchangeSelected = SelectMessageExchange.isMessageExchangeSelected();
-		
-		if (isExchangeSelected) {
-			return invocation.proceed();
-		} else {
-			MessageExchangeSelected annotation = invocation.getTarget().getClass().getAnnotation(MessageExchangeSelected.class);
-			
-			if(annotation != null) {
-				SeamViewIdStack.getInstance().pushViewId(annotation.returnId());
-			} else {
-				SeamViewIdStack.getInstance().pushViewId("home");
-			}
-			
-			return "select-message-exchange";
-		}
-	}
-}

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/SelectMessageExchange.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/SelectMessageExchange.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/SelectMessageExchange.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import org.hibernate.Session;
+import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
@@ -34,7 +35,6 @@
 import org.jboss.seam.annotations.datamodel.DataModel;
 import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
 import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.Manager;
 import org.jboss.soa.esb.admin.console.SeamViewIdStack;
 import org.jboss.soa.esb.admin.console.contract.MessageContract;
 import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
@@ -76,6 +76,7 @@
 	/**
 	 * Initialise all the component members.
 	 */
+	@Create
 	public void initialise() {
 		if(messageExchange == null || !isMessageExchangeSelected()) {
 			messageExchange = new MessageExchange();

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -37,9 +37,10 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.datamodel.DataModel;
 import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
+import org.jboss.soa.esb.admin.console.SeamViewIdStack;
 import org.jboss.soa.esb.admin.console.Toggle;
 import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
-import org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelected;
+import org.jboss.soa.esb.admin.console.exchange.SelectMessageExchange;
 
 /**
  * Manage the <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations targeted at the session selected message exchange.
@@ -48,7 +49,6 @@
 @Name("manageResources")
 @Scope(CONVERSATION)
 @Conversational(ifNotBegunOutcome="home")
- at MessageExchangeSelected(returnId="list-resources")
 public class ManageResources implements Serializable {
 
 	@In(create=true)
@@ -70,11 +70,21 @@
 	
 	@DataModel 
 	private List<TransformationResourceParameter> selectedConfigParams;
+	@DataModelSelectionIndex("selectedConfigParams")
+	int selectedConfigParamsIndex = 0;
 	
+	@In(required=false) @Out(required=false,scope=CONVERSATION)
+	private TransformationResourceParameter selectedConfigParam;
+	
 	@Begin(join=true)
 	public String list() {
+		if(!SelectMessageExchange.isMessageExchangeSelected()) {
+			SeamViewIdStack.getInstance().pushViewId("list-resources");
+			return "select-message-exchange";
+		}
+
 		initialise();
-				
+		
 		return "list-resources";
 	}
 	
@@ -89,6 +99,18 @@
 				
 		return "view-resource";
 	}
+
+	public String selectUpdateParameter() {
+		selectedConfigParam = selectedConfigParams.get(selectedConfigParamsIndex);
+				
+		return "update-resource-parameter";
+	}
+
+	public String updateParameter() {
+		esbDatabase.persist(selectedConfigParam);
+				
+		return "view-resource";
+	}
 	
 	public String deleteConfiguration() {
 		selectedConfig = messageExchangeConfigs.get(messageExchangeConfigIndex);

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -38,8 +38,9 @@
 import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
 import org.jboss.seam.core.FacesMessages;
 import org.jboss.soa.esb.admin.console.SeamUtils;
+import org.jboss.soa.esb.admin.console.SeamViewIdStack;
 import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
-import org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelected;
+import org.jboss.soa.esb.admin.console.exchange.SelectMessageExchange;
 
 /**
  * Add Transformation Resource action handler.
@@ -48,7 +49,6 @@
 @Name("newResource")
 @Scope(CONVERSATION)
 @Conversational(ifNotBegunOutcome="home")
- at MessageExchangeSelected(returnId="new-trans-resource-select-spec")
 public class NewResource implements Serializable {
 
 	@In(create=true)
@@ -90,6 +90,12 @@
 	@Begin(join=true)
 	public String selectResourceSpec() {
 		initialise();
+		
+		if(!SelectMessageExchange.isMessageExchangeSelected()) {
+			SeamViewIdStack.getInstance().pushViewId("new-trans-resource-select-spec");
+			return "select-message-exchange";
+		}
+		
 		return "new-trans-resource-select-spec";
 	}
 	

Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceList.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceList.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceList.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,199 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.admin.console.transform;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.log4j.Logger;
+import org.hibernate.MappingException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.AnnotationConfiguration;
+import org.milyn.xml.XmlUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+/**
+ * Faces converter for a list of transformation resource.
+ * <p/>
+ * Generates a Smooks XML config fragment.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class SmooksResourceList {
+	
+	private static Logger logger = Logger.getLogger(SmooksResourceList.class);
+
+	public static String getList() {
+		StringBuffer stringBuffer = new StringBuffer();
+		Session session = HibernateUtil.getSessionFactory().openSession();
+		List resList;
+		
+		session.beginTransaction();
+		
+		resList = session.createQuery("from TransformationResource").list();
+		if(resList != null && !resList.isEmpty()) {
+			for(int i = 0; i < resList.size(); i++) {
+				TransformationResource resource = (TransformationResource) resList.get(i);
+				
+				appendResource(resource, stringBuffer);
+			}
+		} else {
+			stringBuffer.append("<!-- No configurations found. -->");
+		}
+		
+		session.getTransaction().commit();
+		
+		return stringBuffer.toString();
+	}
+
+	private static void appendResource(TransformationResource resource, StringBuffer stringBuffer) {
+		
+		stringBuffer.append("\n\t<smooks-resource ");
+		if(resource.getSelector() != null && !resource.getSelector().trim().equals("")) {
+			stringBuffer.append("selector=\"").append(resource.getSelector()).append("\" ");
+		}
+		if(resource.getUseragent() != null && !resource.getUseragent().trim().equals("")) {
+			stringBuffer.append("useragent=\"").append(resource.getUseragent()).append("\" ");
+		}
+		if(resource.getNamespace() != null && !resource.getNamespace().trim().equals("")) {
+			stringBuffer.append("namespace=\"").append(resource.getNamespace()).append("\" ");
+		}
+		if(resource.getPath() != null && !resource.getPath().trim().equals("")) {
+			stringBuffer.append("path=\"").append(resource.getPath()).append("\" ");
+		}
+		stringBuffer.append(">");
+
+		List<TransformationResourceParameter> parameters = resource.getParameters();
+		if(parameters != null && !parameters.isEmpty()) {
+			appendParameters(resource, parameters, stringBuffer);
+		}
+	
+		stringBuffer.append("\n\t</smooks-resource>");
+	}
+
+	private static void appendParameters(TransformationResource resource, List<TransformationResourceParameter> parameters, StringBuffer stringBuffer) {
+		TransformationResourceParameter nameParameter = 
+			new TransformationResourceParameter(SmooksUtils.RESOURCE_NAME_PARAM, null, resource.getName());
+		
+		// Append the "Name" parameter.  This is not a "real" parameter.  It's just how we get over the fact that the SmooksResourceConfiguration
+		// class doesn't have "name" attribute like the TransformationResource class.  So, we import and export
+		// as a resource parameter.
+		appendParameter(stringBuffer, nameParameter);
+		for(TransformationResourceParameter param : parameters) {
+			appendParameter(stringBuffer, param);
+		}
+	}
+
+	private static void appendParameter(StringBuffer stringBuffer, TransformationResourceParameter param) {
+		stringBuffer.append("\n\t\t<param name=\"").append(param.getName()).append("\"");
+		if(param.getType() != null && !param.getType().trim().equals("")) {
+			stringBuffer.append(" type=\"").append(param.getType()).append("\"");
+		}
+		stringBuffer.append(">");
+		
+		stringBuffer.append("<![CDATA[");
+		stringBuffer.append(param.getValueAsString());
+		stringBuffer.append("]]>");
+		stringBuffer.append("</param>");
+	}
+	
+	private static class HibernateUtil {
+	    private static final SessionFactory sessionFactory;
+	    static {
+	        try {
+	            // Create the SessionFactory from hibernate.cfg.xml
+	        	AnnotationConfiguration config = new AnnotationConfiguration();
+
+	        	setConfiguration(config);
+	            sessionFactory = config.buildSessionFactory();
+	        } catch (Throwable ex) {
+	            throw new ExceptionInInitializerError(ex);
+	        }
+	    }
+	    
+	    public static SessionFactory getSessionFactory() {
+	        return sessionFactory;
+	    }
+	    
+		private static void setConfiguration(AnnotationConfiguration config) throws ParserConfigurationException, SAXException, IOException {
+			InputStream hibernateConfigStream = HibernateUtil.class.getResourceAsStream("/hibernate.cfg.xml");
+			
+			if(hibernateConfigStream == null) {
+				throw new IllegalStateException("Failed to locate 'hibernate.cfg.xml' in the root fo the classpath.");
+			}
+			
+			DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+			Document configDoc = docBuilder.parse(hibernateConfigStream);
+			
+			// Set the hibernate properties and mappings.  There must be a "proper" way to do
+			// this!!  I tried without doing this and I got exceptions all over the place. 
+			// It wasn't reading the xml config and was looking for a .properties version. Nuts!
+			setHibernateProperties(config, configDoc);
+			setHibernateMappings(config, configDoc);
+		}
+
+		private static void setHibernateProperties(AnnotationConfiguration config, Document configDoc) {
+			NodeList properties = XmlUtil.getNodeList(configDoc, "/hibernate-configuration/session-factory/property");
+			
+			if(properties != null && properties.getLength() != 0) {
+				int propertyCount = properties.getLength();
+				
+				for(int i = 0; i < propertyCount; i++) {
+					Element property = (Element)properties.item(i);
+					config.setProperty("hibernate." + property.getAttribute("name"), property.getTextContent());
+				}
+			} else {
+				logger.warn("No <property> nodes found in 'hibernate.cfg.xml'.");
+			}
+		}
+		
+		private static void setHibernateMappings(AnnotationConfiguration config, Document configDoc) {
+			NodeList mappings = XmlUtil.getNodeList(configDoc, "/hibernate-configuration/session-factory/mapping");
+			
+			if(mappings != null && mappings.getLength() != 0) {
+				int mappingCount = mappings.getLength();
+				
+				for(int i = 0; i < mappingCount; i++) {
+					Element mapping = (Element)mappings.item(i);
+					String className = mapping.getAttribute("class");
+
+					try {
+						config.addAnnotatedClass(Class.forName(className));
+					} catch (ClassNotFoundException e) {
+						throw new IllegalStateException("Failed to map entity '" + className + "'.", e);
+					}
+				}
+			} else {
+				logger.warn("No <mapping> nodes found in 'hibernate.cfg.xml'.");
+			}
+		}
+	}
+
+}

Deleted: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated 
- * by the @authors tag. All rights reserved. 
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors. 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.admin.console.transform;
-
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-
-import org.jboss.soa.esb.admin.console.SeamUtils;
-
-/**
- * Faces converter for a list of transformation resource.
- * <p/>
- * Generates a Smooks XML config fragment.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksResourceListConverter implements Converter {
-
-	/* (non-Javadoc)
-	 * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
-	 */
-	public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String string) throws ConverterException {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
-	 */
-	public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object object) throws ConverterException {
-		StringBuffer stringBuffer = new StringBuffer();
-		
-		if(object instanceof List) {
-			List resList = (List)object;
-			
-			for(int i = 0; i < resList.size(); i++) {
-				TransformationResource resource = (TransformationResource) resList.get(i);
-				
-				appendResource(resource, stringBuffer);
-			}
-		} else {
-			stringBuffer.append("<!-- No configurations found. -->");
-			SeamUtils.printContexts();
-		}
-		
-		return stringBuffer.toString();
-	}
-
-	private static void appendResource(TransformationResource resource, StringBuffer stringBuffer) {
-		
-		stringBuffer.append("\n\t<smooks-resource ");
-		if(resource.getSelector() != null && !resource.getSelector().trim().equals("")) {
-			stringBuffer.append("selector=\"").append(resource.getSelector()).append("\" ");
-		}
-		if(resource.getUseragent() != null && !resource.getUseragent().trim().equals("")) {
-			stringBuffer.append("useragent=\"").append(resource.getUseragent()).append("\" ");
-		}
-		if(resource.getNamespace() != null && !resource.getNamespace().trim().equals("")) {
-			stringBuffer.append("namespace=\"").append(resource.getNamespace()).append("\" ");
-		}
-		if(resource.getPath() != null && !resource.getPath().trim().equals("")) {
-			stringBuffer.append("path=\"").append(resource.getPath()).append("\" ");
-		}
-		stringBuffer.append(">");
-
-		List<TransformationResourceParameter> parameters = resource.getParameters();
-		if(parameters != null && !parameters.isEmpty()) {
-			appendParameters(resource, parameters, stringBuffer);
-		}
-	
-		stringBuffer.append("\n\t</smooks-resource>");
-	}
-
-	private static void appendParameters(TransformationResource resource, List<TransformationResourceParameter> parameters, StringBuffer stringBuffer) {
-		TransformationResourceParameter nameParameter = 
-			new TransformationResourceParameter(SmooksUtils.RESOURCE_NAME_PARAM, null, resource.getName());
-		
-		// Append the "Name" parameter.  This is not a "real" parameter.  It's just how we get over the fact that the SmooksResourceConfiguration
-		// class doesn't have "name" attribute like the TransformationResource class.  So, we import and export
-		// as a resource parameter.
-		appendParameter(stringBuffer, nameParameter);
-		for(TransformationResourceParameter param : parameters) {
-			appendParameter(stringBuffer, param);
-		}
-	}
-
-	private static void appendParameter(StringBuffer stringBuffer, TransformationResourceParameter param) {
-		stringBuffer.append("\n\t\t<param name=\"").append(param.getName()).append("\"");
-		if(param.getType() != null && !param.getType().trim().equals("")) {
-			stringBuffer.append(" type=\"").append(param.getType()).append("\"");
-		}
-		stringBuffer.append(">");
-		
-		stringBuffer.append("<![CDATA[");
-		stringBuffer.append(param.getValueAsString());
-		stringBuffer.append("]]>");
-		stringBuffer.append("</param>");
-	}
-}

Modified: labs/jbossesb/trunk/product/console/view/about.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/about.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/about.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -20,7 +20,7 @@
 		<div class="section">
 		<h2 id="features">1. Features</h2>
 		The features of JBoss ESB Transformation are based largely on those of <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>.
-		<a href="features.jsf">Read more...</a>
+		<a href="features.seam">Read more...</a>
 		</div>
 		
 		<div class="section">

Modified: labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -13,7 +13,7 @@
 		<h:form>			
 			<h2>Manage Message Contracts</h2>
 			<div class="section">
-				This wizard allows you manage "<a href="../about.jsf#message-contract">Message Contracts</a>".
+				This wizard allows you manage "<a href="../about.seam#message-contract">Message Contracts</a>".
 			</div>
 			<div class="section">
 		    <h:outputText value="There are no Message Contracts configured!" rendered="#{contracts != null and contracts.rowCount==0}"/>
@@ -47,7 +47,7 @@
 		</h:form>
 		<h:form>			
 			<div class="section">
-				<s:link action="#{manageContracts.close}" value="Done" linkStyle="button" buttonClass="button" />
+				<s:button action="#{manageContracts.close}" value="Done" />
 			</div>	
 		</h:form>
 	</fieldset>

Modified: labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -12,7 +12,7 @@
 			<h2>Configure New Message Contract</h2>
 		</div>
 		<div class="section">
-			This form allows you to create a new "<a href="../about.jsf#message-contract">Message Contracts</a>".
+			This form allows you to create a new "<a href="../about.seam#message-contract">Message Contracts</a>".
 		</div>
 		<div class="section">
 			<h:form>			

Modified: labs/jbossesb/trunk/product/console/view/index.html
===================================================================
--- labs/jbossesb/trunk/product/console/view/index.html	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/index.html	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,5 +1,5 @@
 <html>
 <head>
-  <meta http-equiv="Refresh" content="0; URL=home.jsf">
+  <meta http-equiv="Refresh" content="0; URL=home.seam">
 </head>
 </html>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -12,7 +12,7 @@
 		<h2>Manage Message Exchange Participants</h2>
 	</div>
 	<div class="section">
-		This form allows you to manage "<a href="../about.jsf#message-exchange-participant">Message Exchange Participants</a>".
+		This form allows you to manage "<a href="../about.seam#message-exchange-participant">Message Exchange Participants</a>".
 	</div>
 	<h:form>			
 		<s:validateAll>

Modified: labs/jbossesb/trunk/product/console/view/transform/import-resources.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/import-resources.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/import-resources.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -31,7 +31,7 @@
 		Resources can also be exported from the console, but the XML needs to be captured from the browser.  Adding a nicer wizard
 		for performing this task is something that needs to be done.  The URL to use for exporting is:
 <pre>
-	http://&lt;console-host&gt;:&lt;console-port&gt;/jboss-esb-console/transform/smooks-config.jsf
+	http://&lt;console-host&gt;:&lt;console-port&gt;/jboss-esb-console/transform/smooks-config.jsp
 </pre>
 		Once you access this URL, view the browser page-source for the exported XML.
 	</div>

Modified: labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -36,7 +36,7 @@
 		</h:form>
 		<h:form>			
 			<div class="section">
-				<s:link action="#{manageResourceSpecs.close}" value="Done" linkStyle="button" buttonClass="button" />
+				<s:button action="#{manageResourceSpecs.close}" value="Done" />
 			</div>	
 		</h:form>
 	</fieldset>
@@ -47,4 +47,4 @@
 <ui:define name="sidebar">
 </ui:define>
 
-</ui:composition>
\ No newline at end of file
+</ui:composition>

Modified: labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -50,7 +50,7 @@
 		</h:form>
 		<h:form>			
 			<div class="section">
-				<s:link action="#{manageResources.close}" value="Done" linkStyle="button" buttonClass="button" />
+				<s:button action="#{manageResources.close}" value="Done" />
 			</div>	
 		</h:form>
 	</fieldset>

Modified: labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -40,7 +40,7 @@
 		</h:form>
 		<h:form>			
 			<div class="section">
-				<s:link action="#{manageResourceSpecs.close}" value="Done" linkStyle="button" buttonClass="button" />
+				<s:button action="#{manageResourceSpecs.close}" value="Done" />
 			</div>	
 		</h:form>
 	</fieldset>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-finish.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-finish.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-finish.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -25,7 +25,7 @@
 		</div>
 
 		<div class="section">
-			<s:link action="#{messageExchangeSelect.finish}" value="Continue..." linkStyle="button" buttonClass="button" />
+			<s:button action="#{messageExchangeSelect.finish}" value="Continue..." />
 		</div>
 
 	</h:form>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-from.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-from.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-exchange-from.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -11,7 +11,7 @@
 	<h:form>
 		<h2>Select Message Exchange : <i>From (Message Producer)...</i></h2>
 		<div class="section">
-			An "active" <a href="../about.jsf#message-exchange">Message Exchange</a> must be selected before making any JBoss ESB Transformation configurations.
+			An "active" <a href="../about.seam#message-exchange">Message Exchange</a> must be selected before making any JBoss ESB Transformation configurations.
 			This wizard allows you select and activate a message exchange, storing your selection in the browser session.  You can reset the active message exchange at any 
 			time by pressing the "Reset Message Exchange" button on the left toolbar.
 			<p/>

Added: labs/jbossesb/trunk/product/console/view/transform/smooks-config.jsp
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/smooks-config.jsp	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/smooks-config.jsp	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd">
+
+<smooks-resource-list>
+
+	<%=org.jboss.soa.esb.admin.console.transform.SmooksResourceList.getList()%>	
+
+</smooks-resource-list>

Added: labs/jbossesb/trunk/product/console/view/transform/update-resource-parameter.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/update-resource-parameter.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/update-resource-parameter.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -0,0 +1,46 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+		xmlns:s="http://jboss.com/products/seam/taglib"
+                template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+	<h:form>			
+		<s:validateAll>
+			<div class="section">
+				<h2>Update Resource Parameter</h2>
+				<div class="entry">
+					<div class="label"><h:outputLabel for="Name">Name:</h:outputLabel></div>
+					<div class="input">
+						<h:inputText id="Name" value="#{selectedConfigParam.name}" disabled="true" />
+						<br/><span class="errors"><h:message for="Name" /></span>
+					</div>
+				</div>
+				<div class="entry">
+					<div class="label"><h:outputLabel for="Value">Value:</h:outputLabel></div>
+					<div class="input">
+						<h:inputTextarea id="Value" value="#{selectedConfigParam.valueAsString}" cols="100" rows="20" required="true" />
+						<br/><span class="errors"><h:message for="Value" /></span>
+					</div>
+				</div>
+				<div class="entry errors"><h:messages globalOnly="true"/></div>
+				
+				<div class="entry">
+					<div class="label"><f:verbatim>&#160;</f:verbatim></div>
+					<div class="input">
+						<h:commandButton value="Update" action="#{manageResources.updateParameter}" class="button"/>
+					</div>
+				</div>
+			</div>
+		</s:validateAll>
+	</h:form>
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+</ui:define>
+
+</ui:composition>

Modified: labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -47,6 +47,10 @@
 	            <f:facet name="header">Parameter Value</f:facet>
 			    <pre>#{parameterSelection.valueAsString}</pre>
 	        </h:column>
+	        <h:column>
+	            <f:facet name="header">Manage</f:facet>
+			    <h:form><h:commandLink action="#{manageResources.selectUpdateParameter}">Update</h:commandLink></h:form>
+	        </h:column>
 	    </h:dataTable>
 	</div>
 
@@ -54,7 +58,7 @@
 		<div class="entry">
 			<div class="label"><f:verbatim>&#160;</f:verbatim></div>
 			<div class="input">
-				<s:link action="#{manageResources.list}" value="Back" linkStyle="button" buttonClass="button" />
+				<s:button action="#{manageResources.list}" value="Back" />
 			</div>
 		</div>		
 	</div>

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/persistUnitTestDB.properties
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/persistUnitTestDB.properties	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/persistUnitTestDB.properties	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,5 +1,5 @@
 #HSQL Database Engine
-#Sat Dec 16 09:57:29 EST 2006
+#Wed Dec 20 22:13:18 GMT 2006
 hsqldb.script_format=0
 runtime.gc_interval=0
 sql.enforce_strict_size=false

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/esb-config-gateway.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/esb-config-gateway.xml	2006-12-20 22:23:34 UTC (rev 8462)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/esb-config-gateway.xml	2006-12-20 22:20:46 UTC (rev 8463)
@@ -1,3 +1,4 @@
+
 <esb-config-gateway parameterReloadSecs="180">
    <esb-jms-gateway
     target-service-category="FirstServices"




More information about the jboss-svn-commits mailing list