[jboss-svn-commits] JBL Code SVN: r7616 - in labs/jbossesb/trunk/product: console console/resources/WEB-INF console/resources/WEB-INF/classes console/src/org/jboss/soa/esb/admin/console console/src/org/jboss/soa/esb/admin/console/contract console/src/org/jboss/soa/esb/admin/console/endpoint console/src/org/jboss/soa/esb/admin/console/transform console/view console/view/contract console/view/endpoint console/view/transform lib/ext

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Nov 15 10:54:48 EST 2006


Author: tfennelly
Date: 2006-11-15 10:54:28 -0500 (Wed, 15 Nov 2006)
New Revision: 7616

Added:
   labs/jbossesb/trunk/product/console/import.sql
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/endpoint/
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/endpoint/ManageEndpoints.java
   labs/jbossesb/trunk/product/console/view/endpoint/
   labs/jbossesb/trunk/product/console/view/endpoint/manage-endpoints.xhtml
   labs/jbossesb/trunk/product/console/view/endpoint/template.xhtml
Removed:
   labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/import.sql
Modified:
   labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPR.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/ManageContracts.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/NewContract.java
   labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java
   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/home.xhtml
   labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter-spec.xhtml
   labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml
   labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml
   labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml
   labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-spec-create.xhtml
   labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-type.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml
   labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-type.xhtml
   labs/jbossesb/trunk/product/lib/ext/milyn-commons-0.8-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.8-SNAPSHOT.jar
Log:
Console updates

Added: labs/jbossesb/trunk/product/console/import.sql
===================================================================
--- labs/jbossesb/trunk/product/console/import.sql	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/import.sql	2006-11-15 15:54:28 UTC (rev 7616)
@@ -0,0 +1,81 @@
+delete from epr;
+delete from messagecontract;
+delete from transformationresourceparameter;
+delete from transformationresource;
+delete from transformationresourceparameterspec;
+delete from transformationresourcespec;
+
+INSERT INTO epr (id, uri) VALUES (1, 'Acme:ITOperationsService');
+INSERT INTO epr (id, uri) VALUES (2, 'JBoss:SupportCenter');
+
+INSERT INTO messagecontract (id, epr, usage, mime, namespace, messagedescription) VALUES (1, 'Acme:ITOperationsService', 'PRODUCES', 'text/csv', 'reportProviderFault', 'http://org.acme/ITOperationsService/reportProviderFault.xsd');
+INSERT INTO messagecontract (id, epr, usage, mime, namespace, messagedescription) VALUES (2, 'JBoss:SupportCenter', 'CONSUMES', 'text/xml', 'postSupportTicket', 'http://www.jboss-services.com/SupportCenter/supportTicket-post.dtd');
+
+--########################################################################
+--#  Templating cdu-creators.
+--########################################################################
+insert into transformationresource (id, name, path, selector, useragent) values 
+	(1, 'XSLT Content Delivery Unit Creator', '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', '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)', 'N/A', 
+	'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, path, description, reference) values 
+	(2, 'StringTemplate', 'N/A', 
+	'Perform a 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> 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 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);
+
+
+--########################################################################
+--#  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);
+
+
+--########################################################################
+--#  Message Flow Parameter
+--########################################################################
+insert into transformationresourcespec (id, name, path, selector, description, reference) values 
+	(4, 'Message Flow Parameter', 'N/A', 'device-parameters',
+	'Set a Message Flow 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);

Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/import.sql
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/import.sql	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/import.sql	2006-11-15 15:54:28 UTC (rev 7616)
@@ -1,5 +0,0 @@
-INSERT INTO epr VALUES (1, 'file://org.acme/ITOperationsService');
-INSERT INTO epr VALUES (2, 'http://www.jboss-services.com/SupportCenter');
-
-INSERT INTO messagecontract (id, epr, usage, mime, namespace, messagedescription) VALUES (1, 'file://org.acme/ITOperationsService', 'PRODUCES', 'text/csv', 'reportProviderFault', 'http://org.acme/ITOperationsService/reportProviderFault.xsd');
-INSERT INTO messagecontract (id, epr, usage, mime, namespace, messagedescription) VALUES (2, 'http://www.jboss-services.com/SupportCenter', 'CONSUMES', 'text/xml', 'postSupportTicket', 'http://www.jboss-services.com/SupportCenter/supportTicket-post.dtd');
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -131,6 +131,12 @@
             <redirect />
         </navigation-case>
 
+        <navigation-case>
+            <from-outcome>manage-endpoints</from-outcome>
+            <to-view-id>/endpoint/manage-endpoints.xhtml</to-view-id>
+            <redirect />
+        </navigation-case>
+
     </navigation-rule>
 
 	<navigation-rule>

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPR.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPR.java	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPR.java	2006-11-15 15:54:28 UTC (rev 7616)
@@ -27,6 +27,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.validator.NotNull;
 import org.jboss.seam.annotations.Name;
 
@@ -41,7 +42,7 @@
 	/**
 	 * Persistence ID ref.
 	 */
-	private Long id;
+	private String id;
 	/**
 	 * The URI of the EPR.
 	 */
@@ -82,15 +83,16 @@
 	/**
 	 * @return Returns the id.
 	 */
-	@Id @GeneratedValue
-	public Long getId() {
+	@Id @GeneratedValue(generator="system-uuid")
+	@GenericGenerator(name="system-uuid", strategy = "uuid")
+	public String getId() {
 		return id;
 	}
 
 	/**
 	 * @param id The id to set.
 	 */
-	public void setId(Long id) {
+	public void setId(String id) {
 		this.id = id;
 	}
 

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/ManageContracts.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/ManageContracts.java	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/ManageContracts.java	2006-11-15 15:54:28 UTC (rev 7616)
@@ -22,30 +22,20 @@
 package org.jboss.soa.esb.admin.console.contract;
 
 import static org.jboss.seam.ScopeType.CONVERSATION;
-import static org.jboss.seam.ScopeType.EVENT;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.hibernate.Session;
 import org.jboss.seam.annotations.Begin;
 import org.jboss.seam.annotations.Conversational;
 import org.jboss.seam.annotations.End;
-import org.jboss.seam.annotations.Factory;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
 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.SeamUtils;
-import org.jboss.soa.esb.admin.console.transform.SmooksUtils;
-import org.jboss.soa.esb.admin.console.transform.TransformationResource;
-import org.jboss.soa.esb.admin.console.transform.TransformationResourceParameter;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlow;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlowSelected;
 
 /**
  * Manage the configured message contracts.

Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/NewContract.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/NewContract.java	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/NewContract.java	2006-11-15 15:54:28 UTC (rev 7616)
@@ -24,6 +24,7 @@
 import static org.jboss.seam.ScopeType.CONVERSATION;
 
 import java.io.Serializable;
+import java.util.List;
 
 import org.hibernate.Session;
 import org.jboss.seam.annotations.Begin;
@@ -34,6 +35,10 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
 import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
+import org.jboss.seam.core.FacesMessages;
+import org.jboss.soa.esb.admin.console.EPR;
 
 /**
  * Add a new Message Contract.
@@ -49,9 +54,23 @@
 
 	@In(create=true)
 	private Session esbDatabase;
-
+	
+	@DataModel
+	private List<EPR> endpoints;
+	@DataModelSelectionIndex("endpoints")
+	int endpointIndex = 0;
+	
+	@In(required=false) @Out(required=false, scope=CONVERSATION)
+	private EPR selectedEndpoint;
+	
+	private void initialise() {
+		endpoints = esbDatabase.createQuery("from EPR order by uri").list();
+		selectedEndpoint = null;
+	}
+	
 	@Begin(join=true)
 	public String showForm() {
+		initialise();
 		return "new-message-contract";
 	}
 	
@@ -60,9 +79,20 @@
 		contract = new MessageContract();
 	}
 	
+	public void selectEndpoint() {
+		selectedEndpoint = endpoints.get(endpointIndex);
+	}
+	
 	@End
 	public String save() {
 		try {
+			if(selectedEndpoint == null) {
+				FacesMessages.instance().add("Message Endpoint not selected.");
+				return null;
+			}
+
+			contract.setEpr(selectedEndpoint.getUri());
+			
 			// Persist...
 			esbDatabase.persist(contract);
 			

Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/endpoint/ManageEndpoints.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/endpoint/ManageEndpoints.java	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/endpoint/ManageEndpoints.java	2006-11-15 15:54:28 UTC (rev 7616)
@@ -0,0 +1,90 @@
+/*
+ * 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.endpoint;
+
+import static org.jboss.seam.ScopeType.CONVERSATION;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.Conversational;
+import org.jboss.seam.annotations.End;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+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.EPR;
+
+/**
+ * Manage the configured message Endpoints.
+ * <p/>
+ * This will all be removed once we integrate the Registry.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Name("manageEndpoints")
+ at Scope(CONVERSATION)
+ at Conversational(ifNotBegunOutcome="home")
+public class ManageEndpoints implements Serializable {
+
+	@In(create=true)
+	private Session esbDatabase;
+	
+	@DataModel
+	private List<EPR> endpoints;
+	@DataModelSelectionIndex("endpoints")
+	int endpointIndex = 0;
+	
+	@In(required=false) @Out(required=true, scope=CONVERSATION)
+	private EPR newEndpoint;
+	
+	private void initialise() {
+		endpoints = esbDatabase.createQuery("from EPR order by uri").list();
+		newEndpoint = new EPR();
+	}
+	
+	@Begin(join=true)
+	public String show() {
+		initialise();
+		
+		return "manage-endpoints";
+	}
+	
+	public void addEndpoint() {
+		esbDatabase.persist(newEndpoint);
+		initialise();
+	}
+	
+	public void deleteEndpoint() {
+		EPR selectedEndpoint = endpoints.get(endpointIndex);
+		esbDatabase.delete(selectedEndpoint);
+		initialise();
+	}
+	
+	@End
+	public String end() {
+		return "home";
+	}
+}

Modified: 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-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java	2006-11-15 15:54:28 UTC (rev 7616)
@@ -94,7 +94,12 @@
 
 	private static void appendParameters(List<TransformationResourceParameter> parameters, StringBuffer stringBuffer) {
 		for(TransformationResourceParameter param : parameters) {
-			stringBuffer.append("\n\t\t<param name=\"").append(param.getName()).append("\">");
+			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("]]>");

Modified: labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -19,7 +19,7 @@
 		    <h:outputText value="There are no Message Contracts configured!" rendered="#{contracts != null and contracts.rowCount==0}"/>
 		    <h:dataTable value="#{contracts}" var="contractSelection" rendered="#{contracts.rowCount>0}">
 		        <h:column>
-		            <f:facet name="header">EPR</f:facet>
+		            <f:facet name="header">Endpoint Logical Name</f:facet>
 				    #{contractSelection.epr}
 		        </h:column>
 		        <h:column>

Modified: labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -8,24 +8,33 @@
 
 <!-- content -->
 <ui:define name="content">
-	<h:form>			
 		<div class="section">
 			<h2>Configure New Message Contract</h2>
 		</div>
 		<div class="section">
 			This form allows you to create a new "Message Contract".  A Message Contract defines a message with respect to the 
-			Endpoint Reference (EPR) that PRODUCES or CONSUMES the message, as well as the type of data contained in the
+			Endpoint Logical Name that PRODUCES or CONSUMES the message, as well as the type of data contained in the
 			message payload.
 		</div>
-		<s:validateAll>
-			<div class="section">
+		<div class="section">
+			<h:form>			
 				<div class="entry">
-					<div class="label"><h:outputLabel for="EPR">Service EPR:</h:outputLabel></div>
+					<div class="label">Endpoint Logical Name (e.g. Service Logical Name):</div>
 					<div class="input">
-						<h:inputText id="EPR" value="#{contract.epr}" size="50" required="true" />
-						<br/><span class="errors"><h:message for="EPR" /></span>
+					    <h:outputText value="There are no Message Endpoints configured!" rendered="#{endpoints != null and endpoints.rowCount==0}"/>
+					    <h:dataTable value="#{endpoints}" var="endpointSelection" rendered="#{endpoints.rowCount>0}">
+					        <h:column>
+					    		<h:outputText value="+" rendered="#{endpointSelection.id==selectedEndpoint.id}"/>
+					        </h:column>
+					        <h:column>
+							    <h:commandLink action="#{newContract.selectEndpoint}">#{endpointSelection.uri}</h:commandLink>
+					        </h:column>
+					    </h:dataTable>
 					</div>
 				</div>
+			</h:form>			
+			<h:form>			
+				<s:validateAll>
 				<div class="entry">
 					<div class="label"><h:outputLabel for="Namespace">Message Namespace (e.g. SOAP Action):</h:outputLabel></div>
 					<div class="input">
@@ -66,19 +75,19 @@
 						<h:commandButton value="Save" action="#{newContract.save}" class="button"/>
 					</div>
 				</div>
+				</s:validateAll>
+			</h:form>
+		</div>
+		<h:form>
+			<div class="section">
+				<div class="entry">
+					<div class="label"><f:verbatim>&#160;</f:verbatim></div>
+					<div class="input">
+						<h:commandButton value="Cancel" action="#{newContract.cancel}" class="button"/>
+					</div>
+				</div>		
 			</div>
-		</s:validateAll>
-	</h:form>
-	<h:form>
-		<div class="section">
-			<div class="entry">
-				<div class="label"><f:verbatim>&#160;</f:verbatim></div>
-				<div class="input">
-					<h:commandButton value="Cancel" action="#{newContract.cancel}" class="button"/>
-				</div>
-			</div>		
-		</div>
-	</h:form>
+		</h:form>
 </ui:define>
 
 <!-- sidebar -->

Added: labs/jbossesb/trunk/product/console/view/endpoint/manage-endpoints.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/endpoint/manage-endpoints.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/endpoint/manage-endpoints.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -0,0 +1,63 @@
+<!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">
+	<div class="section">
+		<h2>Manage Message Endpoints</h2>
+	</div>
+	<div class="section">
+		This form allows you to manage "Message Endpoints".  <i>This functionality will soon be replaced through integration with the Registry Service</i>.
+		<p/>
+		A Message Endpoint is the "Logical" name associated with an entity that can "Produce" or "Consume" messages on the ESB.
+	</div>
+	<h:form>			
+		<s:validateAll>
+			<div class="section">
+			<h3>Add Message Endpoint</h3>
+				<div class="entry">
+					<div class="label"><h:outputLabel for="Endpoint">Endpoint Logical Name (e.g. Service Logical Name):</h:outputLabel></div>
+					<div class="input">
+						<h:inputText id="Endpoint" value="#{newEndpoint.uri}" size="50" required="true" />
+						<br/><span class="errors"><h:message for="Endpoint" /></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="Add" action="#{manageEndpoints.addEndpoint}" class="button"/>
+					</div>
+				</div>
+			</div>
+		</s:validateAll>
+	</h:form>
+	<h:form>
+		<div class="section">
+		    <h:outputText value="There are no Message Endpoints configured!" rendered="#{endpoints != null and endpoints.rowCount==0}"/>
+		    <h:dataTable value="#{endpoints}" var="endpointSelection" rendered="#{endpoints.rowCount>0}">
+		        <h:column>
+		            <f:facet name="header">Endpoint Logical Name</f:facet>
+				    #{endpointSelection.uri}
+		        </h:column>
+		        <h:column>
+		            <f:facet name="header">Manage</f:facet>
+				    <h:commandLink action="#{manageEndpoints.deleteEndpoint}">Delete</h:commandLink>
+		        </h:column>
+		    </h:dataTable>
+		</div>
+	</h:form>
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+</ui:define>
+
+</ui:composition>

Added: labs/jbossesb/trunk/product/console/view/endpoint/template.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/endpoint/template.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/endpoint/template.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:s="http://jboss.com/products/seam/taglib"
+      xmlns:f="http://java.sun.com/jsf/core"
+	  xmlns:h="http://java.sun.com/jsf/html">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>JBoss ESB: Administration Console</title>
+	<link href="../css/screen.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" href="../css/custom.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="../css/global.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="../css/headings.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="../css/layout.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="../css/navigation.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="../css/pagelayout.css" type="text/css" media="all"/>
+	<link rel="stylesheet" href="../css/tables.css" type="text/css" media="all" />
+	
+	<link rel="stylesheet" href="../css/screen_001.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+	<link rel="stylesheet" href="../css/common.css" type="text/css" media="all" />
+</head>
+<body>
+
+<div id="document">
+	<div id="header">
+		<div>
+		  <a href="http://www.jboss.com"><img src="http://www.jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" border="0" /></a>
+		</div>
+		
+		<div id="TopMenu">
+		  <table cellpadding="0" cellspacing="0">
+		  <tr>
+		    <td class="menu_JBnetwork"><a href="http://network.jboss.com/">subscription</a></td>
+		    <td class="menu_JBcom"><a href="http://www.jboss.com/">jboss.com</a></td>
+		
+		    <td class="menu_JBorg"><a href="http://labs.jboss.com">jboss.org</a></td>
+		    <td class="menu_RH"><a href="http://www.redhat.com">redhat.com</a></td>
+		  </tr>
+		  </table>
+		</div>	
+	</div>
+	<div id="container">
+		<div id="sidebar">
+			<b><h:form><h:commandButton value="Home" action="#{manageEndpoints.end}" /></h:form></b>
+			<p/>
+			<ui:insert name="sidebar"/>
+		</div>
+		<div id="content">
+			<ui:insert name="content"/>
+		</div>
+	</div>
+</div>
+<ui:debug hotkey="D"/>
+</body>
+</html>

Modified: labs/jbossesb/trunk/product/console/view/home.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/home.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/home.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -11,24 +11,29 @@
 	<h1>ESB Administration Console</h1>
 	
 	<div class="section">
-		<h2>Message Contract Configurations:</h2>
-		<ul>
-			<li><s:link action="#{newContract.showForm}" value="Configure New Message Contract" /></li>
-			<li><s:link action="#{manageContracts.list}" value="Manage Message Contract Configurations" /></li>
-		</ul>
+		<div class="section">
+			<h2>Message Management:</h2>
+			<ul>
+				<li><s:link action="#{newContract.showForm}" value="Configure New Message Contract" /></li>
+				<li><s:link action="#{manageContracts.list}" value="Manage Message Contracts" /></li>
+				<li><s:link action="#{manageEndpoints.show}" value="Manage Message Endpoints" /></li>
+			</ul>
+		</div>
+		
+		<div class="section">
+			<h2>Message Transformation/Analysis Management:</h2>
+			<ul>
+				<li><s:link action="#{newResource.selectResourceSpec}" value="Configure New Resource" /></li>
+				<li><s:link action="#{manageResources.list}" value="Manage Configurations" /></li>
+			</ul>
+		</div>
+		<div class="section">
+			<ul>
+				<li><s:link action="#{newResourceSpec.captureResourceDetailsConfiguration}" value="Configure New Template" /></li>
+				<li><s:link action="#{manageResourceSpecs.list}" value="Manage Templates" /></li>
+			</ul>
+		</div>
 	</div>
-	
-	<div class="section">
-		<h2>Transformation Configurations:</h2>
-		<ul>
-			<li><s:link action="#{newResource.selectResourceSpec}" value="Configure New Resource" /></li>
-			<li><s:link action="#{manageResources.list}" value="Manage Configurations" /></li>
-		</ul>
-		<ul>
-			<li><s:link action="#{newResourceSpec.captureResourceDetailsConfiguration}" value="Configure New Resource Specification" /></li>
-			<li><s:link action="#{manageResourceSpecs.list}" value="Manage Resource Specifications" /></li>
-		</ul>
-	</div>
 
 </ui:define>
 

Modified: labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter-spec.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter-spec.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter-spec.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -11,7 +11,7 @@
 	<h:form>			
 		<s:validateAll>
 			<div class="section">
-				<h2>Add Resource Parameter Spec</h2>
+				<h2>Add Resource Execution Parameter Spec</h2>
 				<div class="entry">
 					<div class="label"><h:outputLabel for="Name">Name:</h:outputLabel></div>
 					<div class="input">

Modified: labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -15,15 +15,14 @@
 				<div class="entry">
 					<div class="label"><h:outputLabel for="Name">Name:</h:outputLabel></div>
 					<div class="input">
-						<h:inputText id="Name" value="#{transResourceParameter.name}" disabled="true" />
+						<h:inputText id="Name" value="#{transResourceParameter.name}" disabled="#{transResourceParameter.name!=null}" />
 						<br/><span class="errors"><h:message for="Name" /></span>
 					</div>
 				</div>
 				<div class="entry">
-					<div class="label"><h:outputLabel for="Description">Description:</h:outputLabel></div>
-					<div class="input">
-						<h:inputTextarea id="Description" value="#{transResourceParameterSpec.descriptionAsString}" cols="100" rows="5" disabled="true" />
-						<br/><span class="errors"><h:message for="Description" /></span>
+					<div class="label">Description:</div>
+					<div class="output">
+						<h:outputText escape="false" value="#{transResourceParameterSpec.descriptionAsString}" />
 					</div>
 				</div>
 				<div class="entry">

Modified: labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/list-resource-specs.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -24,7 +24,7 @@
 		        </h:column>
 		        <h:column>
 		            <f:facet name="header">Description</f:facet>
-				    #{configSelection.descriptionAsString}
+				    <h:outputText escape="false" value="#{configSelection.descriptionAsString}" />
 		        </h:column>
 		        <h:column>
 		            <f:facet name="header">Reference Data</f:facet>

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-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -11,30 +11,30 @@
 	<div class="section">
 	<fieldset>
 		<h:form>			
-			<h2>Configure New Resource</h2>
+			<h2>Select Message Transformation/Analysis Template</h2>
 			<div class="section">
-				Define the resource configuration by selecting a Resource Specification from the following list and
-				filling in the details.
+				Select the Transformation/Analysis Template upon which you would like the new Transformation/Analysis Resource
+				Configuration to be based.
 			</div>
 			<div class="section">
-			    <h:outputText value="There are no Resource Configuration Specifications!" rendered="#{configurationSpecs != null and configurationSpecs.rowCount==0}"/>
+			    <h:outputText value="There are no Resource Configuration Templates" rendered="#{configurationSpecs != null and configurationSpecs.rowCount==0}"/>
 			    <h:dataTable value="#{configurationSpecs}" var="configSelection" rendered="#{configurationSpecs.rowCount>0}">
 			        <h:column>
+			            <f:facet name="header"><f:verbatim>&#160;</f:verbatim></f:facet>
+					    <h:commandLink action="#{newResource.captureResourceDetailsConfiguration}">Select</h:commandLink>
+			        </h:column>
+			        <h:column>
 			            <f:facet name="header">Name</f:facet>
 					    #{configSelection.name}
 			        </h:column>
 			        <h:column>
 			            <f:facet name="header">Description</f:facet>
-					    #{configSelection.descriptionAsString}
+					    <h:outputText escape="false" value="#{configSelection.descriptionAsString}" />
 			        </h:column>
 			        <h:column>
 			            <f:facet name="header">Reference Data</f:facet>
 			            <h:outputLink value="#{configSelection.reference}" rendered="#{configSelection.reference != null}">Reference...</h:outputLink>
 			        </h:column>
-			        <h:column>
-			            <f:facet name="header"><f:verbatim>&#160;</f:verbatim></f:facet>
-					    <h:commandLink action="#{newResource.captureResourceDetailsConfiguration}">Select</h:commandLink>
-			        </h:column>
 			    </h:dataTable>
 			</div>
 		</h:form>

Modified: labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-spec-create.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-spec-create.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-spec-create.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -13,9 +13,9 @@
 	<fieldset>
 		<h:form>			
 			<s:validateAll>
-				<h2>Configure New Resource Specification</h2>
+				<h2>Configure New Message Transformation/Analysis Template</h2>
 				<div class="section">
-					Define the Resource Configuration "Spec" by specifying details about the Transformation/Analysis Resource, as well
+					Define a new Template by specifying details about the Transformation/Analysis Resource, as well
 					as details about its execution Parameter Set.  Resource Configuration Specifications are used to template and validate
 					new message targeted Transformation/Analysis resources.
 					<p/>

Modified: labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -31,14 +31,14 @@
 					<div class="entry">
 						<div class="label"><h:outputLabel for="Selector">Execution Selector:</h:outputLabel></div>
 						<div class="input">
-							<h:inputText id="Selector" value="#{transResource.selector}" required="true" />
+							<h:inputText id="Selector" value="#{transResource.selector}" required="true" size="100" disabled="#{transResource.selector != null}"/>
 							<br/><span class="errors"><h:message for="Selector" /></span>
 						</div>
 					</div>
 					<div class="entry">
 						<div class="label"><h:outputLabel for="Selector-Namespace">Execution Selector-Namespace:</h:outputLabel></div>
 						<div class="input">
-							<h:inputText id="Selector-Namespace" value="#{transResource.namespace}" required="false" />
+							<h:inputText id="Selector-Namespace" value="#{transResource.namespace}" required="false" size="100" disabled="#{transResource.namespace != null}" />
 							<br/><span class="errors"><h:message for="Selector-Namespace" /></span>
 						</div>
 					</div>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -9,25 +9,25 @@
 <!-- content -->
 <ui:define name="content">
 	<h:form>
-		<h2>Select Message Flow : <i>From EPR...</i></h2>
+		<h2>Select Message Flow : <i>From Endpoint...</i></h2>
 		<div class="section">
 			Select the Message Flow to be associated with all Transformation/Analysis Configurations made on the current browser session.  Note that you don't
-			have to specify a complete message flow.  The selected message flow can, for example, simply be the "From EPR" i.e. you may wish to define/browse
-			message transformation/analysis configurations for all messages produced by a specific Service EPR.  Any combination is supported.
+			have to specify a complete message flow.  The selected message flow can, for example, simply be the "From Endpoint" i.e. you may wish to define/browse
+			message transformation/analysis configurations for all messages produced by a specific message endpoint.  Any combination is supported.
 			<p/>
 			If you wish to cover all message flows (i.e. browse all configurations -OR - create a configuration targeted at all message flows), simply 
 			"reset" the current flow and click through the selection screens without selecting any Message Flow properties.
 		</div>
 
 		<div class="section">
-		    <h:outputText value="No From EPR Definitions Found" rendered="#{fromEPRs != null and fromEPRs.rowCount==0}"/>
+		    <h:outputText value="No From Endpoint Definitions Found" rendered="#{fromEPRs != null and fromEPRs.rowCount==0}"/>
 		    <h:dataTable value="#{fromEPRs}" var="eprFromSelection" rendered="#{fromEPRs.rowCount>0}">
 		        <h:column>
 		            <f:facet name="header"><f:verbatim>&#160;</f:verbatim></f:facet>
 		    		<h:outputText value="+" rendered="#{eprFromSelection.id==messageFlow.fromEPR.id}"/>
 		        </h:column>
 		        <h:column>
-		            <f:facet name="header">From EPRs</f:facet>
+		            <f:facet name="header">From Endpoints (Logical Name)</f:facet>
 				    <s:link action="#{messageFlowSelect.selectFromEPR}" value="#{eprFromSelection.uri}" />
 		        </h:column>
 		    </h:dataTable>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-type.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-type.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-type.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -13,7 +13,7 @@
 		
 		<div class="section">
 		    <f:verbatim rendered="#{fromMessageTypes != null and fromMessageTypes.rowCount==0}">
-		    	Sorry, there are no <u>PRODUCES</u> Message Contracts defined for the selected "From" EPR "<b>#{messageFlow.fromEPR}</b>".
+		    	Sorry, there are no <u>PRODUCES</u> Message Contracts defined for the selected "From" Endpoint "<b>#{messageFlow.fromEPR}</b>".
 		    	<p/>
 		    	Message Contract definitions can be created from the main menu.
 		    </f:verbatim>	
@@ -24,7 +24,7 @@
 		    		<h:outputText value="+" rendered="#{messageTypeSelection.id==messageFlow.fromMessageType.id}"/>
 		        </h:column>
 		        <h:column>
-		            <f:facet name="header">Messages <u>Produced</u> by EPR "<i>#{messageFlow.fromEPR}</i>"</f:facet>
+		            <f:facet name="header">Messages <u>Produced</u> by Endpoint "<i>#{messageFlow.fromEPR}</i>"</f:facet>
 				    <s:link action="#{messageFlowSelect.selectFromMessageType}" value="#{messageTypeSelection}" />
 		        </h:column>
 		    </h:dataTable>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -9,17 +9,17 @@
 <!-- content -->
 <ui:define name="content">
 	<h:form>
-		<h2>Select Message Flow : <i>To EPR...</i></h2>
+		<h2>Select Message Flow : <i>To Endpoint...</i></h2>
 
 		<div class="section">
-		    <h:outputText value="No EPR Definitions Found" rendered="#{toEPRs != null and toEPRs.rowCount==0}"/>
+		    <h:outputText value="No Endpoint Definitions Found" rendered="#{toEPRs != null and toEPRs.rowCount==0}"/>
 		    <h:dataTable value="#{toEPRs}" var="eprToSelection" rendered="#{toEPRs.rowCount>0}">
 		        <h:column>
 		            <f:facet name="header"><f:verbatim>&#160;</f:verbatim></f:facet>
 		    		<h:outputText value="+" rendered="#{eprToSelection.id==messageFlow.toEPR.id}"/>
 		        </h:column>
 		        <h:column>
-		            <f:facet name="header">To EPRs</f:facet>
+		            <f:facet name="header">To Endpoints (Logical Name)</f:facet>
 				    <s:link action="#{messageFlowSelect.selectToEPR}" value="#{eprToSelection.uri}" />
 		        </h:column>
 		    </h:dataTable>

Modified: labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-type.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-type.xhtml	2006-11-15 15:48:11 UTC (rev 7615)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-type.xhtml	2006-11-15 15:54:28 UTC (rev 7616)
@@ -13,7 +13,7 @@
 		
 		<div class="section">
 		    <f:verbatim rendered="#{toMessageTypes != null and toMessageTypes.rowCount==0}">
-		    	Sorry, there are no <u>CONSUMES</u> Message Contracts defined for the selected "To" EPR "<b>#{messageFlow.toEPR}</b>".
+		    	Sorry, there are no <u>CONSUMES</u> Message Contracts defined for the selected "To" Endpoint "<b>#{messageFlow.toEPR}</b>".
 		    	<p/>
 		    	Message Contract definitions can be created from the main menu.
 		    </f:verbatim>	
@@ -24,7 +24,7 @@
 		    		<h:outputText value="+" rendered="#{messageTypeSelection.id==messageFlow.toMessageType.id}"/>
 		        </h:column>
 		        <h:column>
-		            <f:facet name="header">Messages <u>Consumed</u> by EPR "<i>#{messageFlow.toEPR}</i></f:facet>
+		            <f:facet name="header">Messages <u>Consumed</u> by Endpoint "<i>#{messageFlow.toEPR}</i></f:facet>
 				    <s:link action="#{messageFlowSelect.selectToMessageType}" value="#{messageTypeSelection}" />
 		        </h:column>
 		    </h:dataTable>

Modified: labs/jbossesb/trunk/product/lib/ext/milyn-commons-0.8-SNAPSHOT.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.8-SNAPSHOT.jar
===================================================================
(Binary files differ)




More information about the jboss-svn-commits mailing list