[jboss-svn-commits] JBL Code SVN: r7796 - in labs/jbossesb/trunk/product/console: . resources/WEB-INF src/org/jboss/soa/esb/admin/console src/org/jboss/soa/esb/admin/console/contract src/org/jboss/soa/esb/admin/console/exchange src/org/jboss/soa/esb/admin/console/exchange/participant src/org/jboss/soa/esb/admin/console/transform test/src/org/jboss/soa/esb/admin/console/transform test/src/org/jboss/soa/esb/admin/console/transform/flow view view/contract view/participant view/transform
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 23 10:11:31 EST 2006
Author: tfennelly
Date: 2006-11-23 10:11:15 -0500 (Thu, 23 Nov 2006)
New Revision: 7796
Added:
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchange.java
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/exchange/SelectMessageExchange.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/TransformationConfigRejoin.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/ManageParticipants.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/Participant.java
labs/jbossesb/trunk/product/console/view/participant/
labs/jbossesb/trunk/product/console/view/participant/index.xhtml
labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml
labs/jbossesb/trunk/product/console/view/participant/template.xhtml
Removed:
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/EPRConverter.java
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/transform/flow/
labs/jbossesb/trunk/product/console/view/endpoint/
labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml
labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml
Modified:
labs/jbossesb/trunk/product/console/build.properties
labs/jbossesb/trunk/product/console/import.sql
labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml
labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/MessageContract.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/ManageResourceSpecs.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/src/org/jboss/soa/esb/admin/console/transform/NewResourceSpec.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksUtils.java
labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksUtilsTest.java
labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/flow/MessageContractTest.java
labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml
labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.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/new-trans-resource-target.xhtml
labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
Log:
Updating console to reflect removal of all mention of "Endpoints" and "Services".
Modified: labs/jbossesb/trunk/product/console/build.properties
===================================================================
--- labs/jbossesb/trunk/product/console/build.properties 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/build.properties 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,2 +1,2 @@
-#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
Modified: labs/jbossesb/trunk/product/console/import.sql
===================================================================
--- labs/jbossesb/trunk/product/console/import.sql 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/import.sql 2006-11-23 15:11:15 UTC (rev 7796)
@@ -79,11 +79,11 @@
--########################################################################
---# Message Flow Parameter
+--# Message Exchange 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.',
+ (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);
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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/faces-config.xml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -27,35 +27,23 @@
<navigation-case>
<from-outcome>select-message-flow</from-outcome>
- <to-view-id>/transform/select-message-flow-from-epr.xhtml</to-view-id>
+ <to-view-id>/transform/select-message-flow-from.xhtml</to-view-id>
<redirect />
</navigation-case>
<navigation-case>
- <from-outcome>select-message-flow-from-epr</from-outcome>
- <to-view-id>/transform/select-message-flow-from-epr.xhtml</to-view-id>
+ <from-outcome>select-message-flow-from</from-outcome>
+ <to-view-id>/transform/select-message-flow-from.xhtml</to-view-id>
<redirect />
</navigation-case>
<navigation-case>
- <from-outcome>select-message-flow-from-type</from-outcome>
- <to-view-id>/transform/select-message-flow-from-type.xhtml</to-view-id>
+ <from-outcome>select-message-flow-to</from-outcome>
+ <to-view-id>/transform/select-message-flow-to.xhtml</to-view-id>
<redirect />
</navigation-case>
<navigation-case>
- <from-outcome>select-message-flow-to-epr</from-outcome>
- <to-view-id>/transform/select-message-flow-to-epr.xhtml</to-view-id>
- <redirect />
- </navigation-case>
-
- <navigation-case>
- <from-outcome>select-message-flow-to-type</from-outcome>
- <to-view-id>/transform/select-message-flow-to-type.xhtml</to-view-id>
- <redirect />
- </navigation-case>
-
- <navigation-case>
<from-outcome>select-message-flow-finish</from-outcome>
<to-view-id>/transform/select-message-flow-finish.xhtml</to-view-id>
<redirect />
@@ -138,8 +126,8 @@
</navigation-case>
<navigation-case>
- <from-outcome>manage-endpoints</from-outcome>
- <to-view-id>/endpoint/manage-endpoints.xhtml</to-view-id>
+ <from-outcome>manage-participants</from-outcome>
+ <to-view-id>/endpoint/manage-participants.xhtml</to-view-id>
<redirect />
</navigation-case>
Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/pages.xml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,6 +1,6 @@
<pages>
- <!-- Make sure that the Message Flow gets initialised... -->
- <page view-id="/transform/select-message-flow-from-epr.xhtml" action="#{messageFlowSelect.initialise}"/>
+ <!-- Make sure that the Message Exchange gets initialised... -->
+ <page view-id="/transform/select-message-flow-from.xhtml" action="#{messageExchangeSelect.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}"/>
Deleted: 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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPR.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,106 +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;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.validator.NotNull;
-import org.jboss.seam.annotations.Name;
-
-/**
- * Endpoint Reference Entity Bean.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
- at Entity
- at Name("epr")
-public class EPR implements Serializable {
-
- /**
- * Persistence ID ref.
- */
- private String id;
- /**
- * The URI of the EPR.
- */
- private String uri;
-
- /**
- * Public default constructor.
- */
- public EPR() {
- }
-
- /**
- * Public constructor.
- * @param uri EPR URI.
- */
- public EPR(String uri) {
- this.uri = uri;
- }
-
- /**
- * Get the URI.
- * @return Returns the uri.
- */
- @NotNull
- public String getUri() {
- // TODO: Add a regex @Pattern for URI validation.
- return uri;
- }
-
- /**
- * Set the URI.
- * @param uri The uri to set.
- */
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- /**
- * @return Returns the id.
- */
- @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(String id) {
- this.id = id;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return uri;
- }
-}
Deleted: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPRConverter.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPRConverter.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/EPRConverter.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,53 +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;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-
-/**
- * Facelets converter for the EPR type.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class EPRConverter 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 {
-
- return new EPR(string);
- }
-
- /* (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 {
-
- return ((EPR)object).getUri();
- }
-
-}
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/MessageContract.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/MessageContract.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/MessageContract.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -34,9 +34,9 @@
/**
* Message contract definition.
* <p/>
- * This class defines message properties with respect to the type of data contained in the message, as well as the EPR
- * that produces or consumes the message. It basically puts some typing information around the messages that flow
- * through the ESB.
+ * This class defines message properties with respect to the type of data contained in the message, as well as the
+ * {@link org.jboss.soa.esb.admin.console.exchange.participant.Participant} that produces or consumes the message. It basically
+ * puts some typing information around the messages that exchange through the ESB.
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
@@ -45,7 +45,7 @@
public class MessageContract implements Serializable {
/**
- * Enumeration type for how a message type is used by the service located at the associated EPR.
+ * Enumeration type for how a message type is used by the service located at the associated Participant.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
public static enum USAGE {
@@ -58,11 +58,11 @@
*/
private String id;
/**
- * The EPR that this message type is associated with.
+ * The Participant that this message type is associated with.
*/
- private String epr;
+ private String participant;
/**
- * How this message is used by the EPR.
+ * How this message is used by the Participant.
*/
private String usage;
/**
@@ -82,7 +82,7 @@
// making this class look like...
// class MessageContract {
// MessageType messageType;
- // EPR serviceEPR;
+ // Participant participant;
// USAGE messageUsage;
// }
@@ -105,18 +105,18 @@
}
/**
- * @return Returns the epr.
+ * @return Returns the participant.
*/
@NotNull
- public String getEpr() {
- return epr;
+ public String getParticipant() {
+ return participant;
}
/**
- * @param epr The epr to set.
+ * @param participant The participant to set.
*/
- public void setEpr(String epr) {
- this.epr = epr;
+ public void setParticipant(String participant) {
+ this.participant = participant;
}
/**
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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/NewContract.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -38,7 +38,7 @@
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;
+import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
/**
* Add a new Message Contract.
@@ -56,16 +56,16 @@
private Session esbDatabase;
@DataModel
- private List<EPR> endpoints;
- @DataModelSelectionIndex("endpoints")
- int endpointIndex = 0;
+ private List<Participant> participants;
+ @DataModelSelectionIndex("participants")
+ int participantIndex = 0;
@In(required=false) @Out(required=false, scope=CONVERSATION)
- private EPR selectedEndpoint;
+ private Participant participant;
private void initialise() {
- endpoints = esbDatabase.createQuery("from EPR order by uri").list();
- selectedEndpoint = null;
+ participants = esbDatabase.createQuery("from Participant order by name").list();
+ participant = null;
}
@Begin(join=true)
@@ -79,19 +79,19 @@
contract = new MessageContract();
}
- public void selectEndpoint() {
- selectedEndpoint = endpoints.get(endpointIndex);
+ public void selectParticipant() {
+ participant = participants.get(participantIndex);
}
@End
public String save() {
try {
- if(selectedEndpoint == null) {
- FacesMessages.instance().add("Message Endpoint not selected.");
+ if(participant == null) {
+ FacesMessages.instance().add("Message Participant not selected.");
return null;
}
- contract.setEpr(selectedEndpoint.getUri());
+ contract.setParticipant(participant.getName());
// Persist...
esbDatabase.persist(contract);
Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchange.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchange.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchange.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,219 @@
+/*
+ * 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 java.io.Serializable;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.soa.esb.admin.console.contract.MessageContract;
+import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
+
+/**
+ * Message Exchange.
+ * <p/>
+ * This class defines properties used to target message transformation resources at a message exchange,
+ * or a subset there of.
+ * <p/>
+ * This class will likely be expanded to include support for other message profile types.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Name("messageFLow")
+public class MessageExchange implements Serializable {
+
+ public static final String FROM = "from:";
+ public static final String FROM_TYPE = "from-type:";
+ public static final String TO = "to:";
+ public static final String TO_TYPE = "to-type:";
+
+ @In(required=false) @Out(required=false)
+ private Participant from;
+
+ @In(required=false) @Out(required=false)
+ private MessageContract fromMessageType;
+
+ @In(required=false) @Out(required=false)
+ private Participant to;
+
+ @In(required=false) @Out(required=false)
+ private MessageContract toMessageType;
+
+ /**
+ * Set the message source {@link Participant}.
+ * @param from The from to set.
+ */
+ public void setFrom(Participant from) {
+ this.from = from;
+ }
+
+ /**
+ * Get the message source {@link Participant}.
+ * @return Returns the from.
+ */
+ public Participant getFrom() {
+ return from;
+ }
+
+ /**
+ * Set the message type associated with the exchange.
+ * @param fromMessageType The fromMessageType to set.
+ */
+ public void setFromMessageType(MessageContract messageType) {
+ this.fromMessageType = messageType;
+ }
+
+ /**
+ * Get the message type associated with the exchange.
+ * @return Returns the fromMessageType.
+ */
+ public MessageContract getFromMessageType() {
+ return fromMessageType;
+ }
+
+ /**
+ * Set the message destination {@link Participant}.
+ * @param to The to to set.
+ */
+ public void setTo(Participant to) {
+ this.to = to;
+ }
+
+ /**
+ * Get the message destination {@link Participant}.
+ * @return Returns the to.
+ */
+ public Participant getTo() {
+ return to;
+ }
+
+ /**
+ * @param toMessageType The toMessageType to set.
+ */
+ public void setToMessageType(MessageContract toMessageType) {
+ this.toMessageType = toMessageType;
+ }
+
+ /**
+ * @return Returns the toMessageType.
+ */
+ public MessageContract getToMessageType() {
+ return toMessageType;
+ }
+
+ @Out
+ public String getExchangeUseragentString() {
+ if(fromMessageType == null && from == null && toMessageType == null && to == null) {
+ return "*";
+ }
+
+ StringBuffer stringBuffer = new StringBuffer();
+
+ if(fromMessageType != null) {
+ stringBuffer.append(FROM_TYPE);
+ stringBuffer.append(fromMessageType != null?fromMessageType:"*");
+ stringBuffer.append(from != null || toMessageType != null || to != null?" AND ":"");
+ }
+
+ if(from != null) {
+ stringBuffer.append(FROM);
+ stringBuffer.append(from != null?from:"*");
+ stringBuffer.append(toMessageType != null || to != null?" AND ":"");
+ }
+
+ if(toMessageType != null) {
+ stringBuffer.append(TO_TYPE);
+ stringBuffer.append(toMessageType != null?toMessageType:"*");
+ stringBuffer.append(to != null?" AND ":"");
+ }
+
+ if(to != null) {
+ stringBuffer.append(TO);
+ stringBuffer.append(to != null?to:"*");
+ }
+
+ return stringBuffer.toString().trim();
+ }
+
+ @Out
+ public String getExchangeUseragentStringAsHtml() {
+ if(fromMessageType == null && from == null && toMessageType == null && to == null) {
+ return "All Messages";
+ }
+
+ StringBuffer stringBuffer = new StringBuffer();
+
+ stringBuffer.append("<b>").append(FROM_TYPE).append("</b>");
+ stringBuffer.append(fromMessageType != null?fromMessageType:"*");
+ stringBuffer.append("<br/>AND<br/>");
+
+ stringBuffer.append("<b>").append(FROM).append("</b>");
+ stringBuffer.append(from != null?from:"*");
+ stringBuffer.append("<br/>AND<br/>");
+
+ stringBuffer.append("<b>").append(TO_TYPE).append("</b>");
+ stringBuffer.append(toMessageType != null?toMessageType:"*");
+ stringBuffer.append("<br/>AND<br/>");
+
+ stringBuffer.append("<b>").append(TO).append("</b>");
+ stringBuffer.append(to != null?to:"*");
+
+ return stringBuffer.toString();
+ }
+
+ @Out
+ public String getExchangeAsHtml() {
+ if(fromMessageType == null && from == null && toMessageType == null && to == null) {
+ return "All Messages";
+ }
+
+ StringBuffer stringBuffer = new StringBuffer();
+
+ stringBuffer.append("<b>").append(FROM_TYPE).append("</b> ");
+ stringBuffer.append(fromMessageType != null?fromMessageType:"*");
+ stringBuffer.append("<br/>");
+
+ stringBuffer.append("<b>").append(FROM).append("</b> ");
+ stringBuffer.append(from != null?from:"*");
+ stringBuffer.append("<br/>");
+
+ stringBuffer.append("<b>").append(TO_TYPE).append("</b> ");
+ stringBuffer.append(toMessageType != null?toMessageType:"*");
+ stringBuffer.append("<br/>");
+
+ stringBuffer.append("<b>").append(TO).append("</b> ");
+ stringBuffer.append(to != null?to:"*");
+
+ return stringBuffer.toString();
+ }
+
+ /**
+ * Reset the message exchange.
+ */
+ public void reset() {
+ from = null;
+ fromMessageType = null;
+ to = null;
+ toMessageType = null;
+ }
+}
Added: 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-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelected.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,42 @@
+/*
+ * 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.Documented;
+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 Documented
+ at Interceptors(MessageExchangeSelectedInterceptor.class)
+public @interface MessageExchangeSelected {}
Added: 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-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/MessageExchangeSelectedInterceptor.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+/**
+ * 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 {
+ return "select-message-exchange";
+ }
+ }
+}
Added: 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-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/SelectMessageExchange.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,173 @@
+/*
+ * 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 org.jboss.seam.ScopeType.SESSION;
+
+import java.io.Serializable;
+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;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.soa.esb.admin.console.contract.MessageContract;
+import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
+
+/**
+ * Message Exchange Select Listener.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Name("messageExchangeSelect")
+ at Scope(SESSION)
+public class SelectMessageExchange implements Serializable {
+
+ @In(create=true)
+ private Session esbDatabase;
+
+ @DataModel
+ private List<MessageContract> fromMessageTypes;
+ @DataModelSelectionIndex("fromMessageTypes")
+ int fromMessageTypeIndex = 0;
+
+ @DataModel
+ private List<Participant> fromParticipants;
+ @DataModelSelectionIndex("fromParticipants")
+ int fromParticipantSelectionIndex = 0;
+
+ @DataModel
+ private List<MessageContract> toMessageTypes;
+ @DataModelSelectionIndex("toMessageTypes")
+ int toMessageTypeIndex = 0;
+
+ @DataModel
+ private List<Participant> toParticipants;
+ @DataModelSelectionIndex("toParticipants")
+ int toParticipantSelectionIndex = 0;
+
+ @In(required=false) @Out(scope=SESSION)
+ private MessageExchange messageExchange;
+
+ /**
+ * Initialise all the component members.
+ */
+ public void initialise() {
+ if(messageExchange == null || !isMessageExchangeSelected()) {
+ messageExchange = new MessageExchange();
+ Contexts.getSessionContext().set(MessageExchange.class.getName(), "set");
+
+ fromParticipants = esbDatabase.createQuery("from Participant order by uri").list();
+ toParticipants = esbDatabase.createQuery("from Participant order by uri").list();
+ }
+ }
+
+ /**
+ * Reinitialise all the component members.
+ */
+ public void reinitialise() {
+ messageExchange = null;
+ initialise();
+ }
+
+ public String showFrom() {
+ reinitialise();
+ return "select-message-exchange-from";
+ }
+
+ public String showTo() {
+ return "select-message-exchange-to";
+ }
+
+ public String showFinish() {
+ return "select-message-exchange-finish";
+ }
+
+ /**
+ * Select the "from" {@link Participant} action listener method.
+ */
+ public void selectFrom() {
+ Participant from;
+
+ from = fromParticipants.get(fromParticipantSelectionIndex);
+ messageExchange.setFrom(from);
+
+ // Select the message contracts *produced* by the selected "from" Participant...
+ fromMessageTypes = esbDatabase.createQuery("from MessageContract where participant = :participant and usage = 'PRODUCES'")
+ .setParameter("participant", from.getName())
+ .list();
+ }
+
+ /**
+ * Select the "from" {@link MessageContract} action listener method.
+ */
+ public void selectFromMessageType() {
+ messageExchange.setFromMessageType(fromMessageTypes.get(fromMessageTypeIndex));
+ }
+
+ /**
+ * Select the "to" {@link Participant} action listener method.
+ */
+ public void selectTo() {
+ Participant to;
+
+ to = toParticipants.get(toParticipantSelectionIndex);
+ messageExchange.setTo(to);
+
+ // Select the message contracts *consumed* by the selected "from" Participant...
+ toMessageTypes = esbDatabase.createQuery("from MessageContract where participant = :participant and usage = 'CONSUMES'")
+ .setParameter("participant", to.getName())
+ .list();
+ }
+
+ /**
+ * Select the "to" {@link MessageContract} action listener method.
+ */
+ public void selectToMessageType() {
+ messageExchange.setToMessageType(toMessageTypes.get(toMessageTypeIndex));
+ }
+
+ /**
+ * Cancel
+ * @return
+ */
+ public String cancel() {
+ messageExchange = new MessageExchange();
+ Contexts.getSessionContext().set(MessageExchange.class.getName(), "notset");
+
+ return "home";
+ }
+
+ /**
+ * Is the {@link MessageExchange} selected on the current session.
+ * @return True if the {@link MessageExchange} is selected on the current session, otherwise false.
+ */
+ public static boolean isMessageExchangeSelected() {
+ String set = (String)Contexts.getSessionContext().get(MessageExchange.class.getName());
+
+ return (set != null && set.equals("set"));
+ }
+}
Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/TransformationConfigRejoin.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/TransformationConfigRejoin.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/TransformationConfigRejoin.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,47 @@
+/*
+ * 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 org.jboss.seam.ScopeType.EVENT;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * Action listener for rejoining whichever Transformation Configuration conversation
+ * was interupted by the Message Exchange selection process.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Name("transConfigRejoin")
+ at Scope(EVENT)
+public class TransformationConfigRejoin {
+
+ /**
+ * Action listener method.
+ * @return The view ID to rejoin.
+ */
+ public String rejoin() {
+ // TODO: Find out how to rejoin the conversation that was interrupted in order to select the message exchange.
+ return "home";
+ }
+}
Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/ManageParticipants.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/ManageParticipants.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/ManageParticipants.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,87 @@
+/*
+ * 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.participant;
+
+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;
+
+/**
+ * Manage the configured message Transformation/Analysis {@link org.jboss.soa.esb.admin.console.exchange.participant.Participant Participants}.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Name("manageParticipants")
+ at Scope(CONVERSATION)
+ at Conversational(ifNotBegunOutcome="home")
+public class ManageParticipants implements Serializable {
+
+ @In(create=true)
+ private Session esbDatabase;
+
+ @DataModel
+ private List<Participant> participants;
+ @DataModelSelectionIndex("participants")
+ int participantIndex = 0;
+
+ @In(required=false) @Out(required=true, scope=CONVERSATION)
+ private Participant newParticipant;
+
+ private void initialise() {
+ participants = esbDatabase.createQuery("from Participant order by name").list();
+ newParticipant = new Participant();
+ }
+
+ @Begin(join=true)
+ public String show() {
+ initialise();
+
+ return "manage-participants";
+ }
+
+ public void addParticipant() {
+ esbDatabase.persist(newParticipant);
+ initialise();
+ }
+
+ public void deleteParticipant() {
+ Participant selectedParticipant = participants.get(participantIndex);
+ esbDatabase.delete(selectedParticipant);
+ initialise();
+ }
+
+ @End
+ public String end() {
+ return "home";
+ }
+}
Added: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/Participant.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/Participant.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/exchange/participant/Participant.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,109 @@
+/*
+ * 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.participant;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.validator.NotNull;
+import org.jboss.seam.annotations.Name;
+
+/**
+ * Transformation "Participant".
+ * <p/>
+ * All message transformation/analysis resources within JBoss ESB need to be specified with respect
+ * to 2 participants - the message "Producer" and message "Consumer".
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Entity
+ at Name("participant")
+public class Participant implements Serializable {
+
+ /**
+ * Persistence ID ref.
+ */
+ private String id;
+ /**
+ * The URI of the Participant.
+ */
+ private String name;
+
+ /**
+ * Public default constructor.
+ */
+ public Participant() {
+ }
+
+ /**
+ * Public constructor.
+ * @param name Participant URI.
+ */
+ public Participant(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Get the name.
+ * @return Returns the name.
+ */
+ @NotNull
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Set the name.
+ * @param name The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return Returns the id.
+ */
+ @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(String id) {
+ this.id = id;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return name;
+ }
+}
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResourceSpecs.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResourceSpecs.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResourceSpecs.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -78,7 +78,7 @@
}
/**
- * Initialise the message flow configurations list.
+ * Initialise the message exchange configurations list.
*/
private void initialise() {
// Read all resources config specs from the DB...
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-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -38,29 +38,29 @@
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
import org.jboss.soa.esb.admin.console.Toggle;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlow;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlowSelected;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelected;
/**
- * Manage the <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations targeted at the session selected message flow.
+ * Manage the <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations targeted at the session selected message exchange.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
@Name("manageResources")
@Scope(CONVERSATION)
@Conversational(ifNotBegunOutcome="home")
- at MessageFlowSelected
+ at MessageExchangeSelected
public class ManageResources implements Serializable {
@In(create=true)
private Session esbDatabase;
@In
- private MessageFlow messageFlow;
+ private MessageExchange messageExchange;
@DataModel
- private List<TransformationResource> messageFlowConfigs;
- @DataModelSelectionIndex("messageFlowConfigs")
- int messageFlowConfigIndex = 0;
+ private List<TransformationResource> messageExchangeConfigs;
+ @DataModelSelectionIndex("messageExchangeConfigs")
+ int messageExchangeConfigIndex = 0;
@In(required=false) @Out(scope=CONVERSATION)
private Toggle showAll;
@@ -87,14 +87,14 @@
}
public String viewConfiguration() {
- selectedConfig = messageFlowConfigs.get(messageFlowConfigIndex);
+ selectedConfig = messageExchangeConfigs.get(messageExchangeConfigIndex);
selectedConfigParams = selectedConfig.getParameters();
return "view-resource";
}
public String deleteConfiguration() {
- selectedConfig = messageFlowConfigs.get(messageFlowConfigIndex);
+ selectedConfig = messageExchangeConfigs.get(messageExchangeConfigIndex);
for(TransformationResourceParameter parameter : selectedConfig.getParameters()) {
esbDatabase.delete(parameter);
}
@@ -110,7 +110,7 @@
}
/**
- * Initialise the message flow configurations list.
+ * Initialise the message exchange configurations list.
*/
private void initialise() {
List<TransformationResource> allResourceConfigs;
@@ -118,13 +118,13 @@
// Read all resources configs from the DB...
allResourceConfigs = esbDatabase.createQuery("from TransformationResource").list();
- // Filter and sort the resource configs for the selected message flow (for display)...
- messageFlowConfigs = SmooksUtils.getMessageFlowConfigs(messageFlow, allResourceConfigs);
+ // Filter and sort the resource configs for the selected message exchange (for display)...
+ messageExchangeConfigs = SmooksUtils.getMessageExchangeConfigs(messageExchange, allResourceConfigs);
if(!showAll.isOn()) {
- Iterator<TransformationResource> listIterator = messageFlowConfigs.iterator();
+ Iterator<TransformationResource> listIterator = messageExchangeConfigs.iterator();
while(listIterator.hasNext()) {
TransformationResource resource = listIterator.next();
- if(!resource.getUseragent().equalsIgnoreCase(messageFlow.getFlowUseragentString())) {
+ if(!resource.getUseragent().equalsIgnoreCase(messageExchange.getExchangeUseragentString())) {
listIterator.remove();
}
}
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-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -39,8 +39,8 @@
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.transform.flow.MessageFlow;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlowSelected;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelected;
/**
* Add Transformation Resource action handler.
@@ -49,14 +49,14 @@
@Name("newResource")
@Scope(CONVERSATION)
@Conversational(ifNotBegunOutcome="home")
- at MessageFlowSelected
+ at MessageExchangeSelected
public class NewResource implements Serializable {
@In(create=true)
private Session esbDatabase;
@In
- private MessageFlow messageFlow;
+ private MessageExchange messageExchange;
@DataModel
private List<TransformationResourceSpec> configurationSpecs;
@@ -96,7 +96,7 @@
// Create the new resource from the selected spec and set the useragent...
transResource = selectedConfigSpec.toTransformationResource();
parameterList = transResource.getParameters();
- transResource.setUseragent(messageFlow.getFlowUseragentString());
+ transResource.setUseragent(messageExchange.getExchangeUseragentString());
return "new-trans-resource-create";
}
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResourceSpec.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResourceSpec.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResourceSpec.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -37,8 +37,8 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.soa.esb.admin.console.SeamUtils;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlow;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlowSelected;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchangeSelected;
/**
* Add Transformation Resource Specification action handler.
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksUtils.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksUtils.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksUtils.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -27,7 +27,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlow;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
import org.milyn.SmooksStandalone;
import org.milyn.cdr.SmooksResourceConfiguration;
import org.milyn.container.standalone.StandaloneContainerSession;
@@ -39,71 +39,71 @@
public class SmooksUtils {
/**
- * Get the ordered set of message {@link TransformationResource}s targetd at the supplied message flow.
+ * Get the ordered set of message {@link TransformationResource}s targetd at the supplied message exchange.
* <p/>
* The resource are grouped by selector and ordered according to their specificity. See
* <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>.
- * @param messageFlow The message flow whose resources we're interested in.
+ * @param messageExchange The message exchange whose resources we're interested in.
* @param allResourceConfigs All the configured transformation resources on this ESB instance.
- * @return List of transformation resources targeted at the supplied message flow.
+ * @return List of transformation resources targeted at the supplied message exchange.
*/
- public static List<TransformationResource> getMessageFlowConfigs(MessageFlow messageFlow, List<TransformationResource> allResourceConfigs) {
+ public static List<TransformationResource> getMessageExchangeConfigs(MessageExchange messageExchange, List<TransformationResource> allResourceConfigs) {
SmooksStandalone smooks = new SmooksStandalone("UTF-8");
String messageUAString = "JBossESBMessage"; // Doesn't really matter what this string is because of how we're using it here!
StandaloneContainerSession messageUASession;
- Map messageFlowConfigsMap;
- List<TransformationResource> messageFlowConfigsList = new ArrayList<TransformationResource>();;
+ Map messageExchangeConfigsMap;
+ List<TransformationResource> messageExchangeConfigsList = new ArrayList<TransformationResource>();;
// Register all the configurations on the context...
for(TransformationResource resourceConfig : allResourceConfigs) {
smooks.registerResource(DBLinkedSmooksResourceConfiguration.getInstance(resourceConfig));
}
- // Capture the message flow properties as useragent profiles...
- String[] profilesArray = getMessageFlowProfiles(messageFlow);
+ // Capture the message exchange properties as useragent profiles...
+ String[] profilesArray = getMessageExchangeProfiles(messageExchange);
- // Create and register a message useragent with the message flow profiles ...
+ // Create and register a message useragent with the message exchange profiles ...
smooks.registerUseragent(messageUAString, profilesArray);
messageUASession = smooks.getSession(messageUAString);
// Filter out the configurations for the message session...
- messageFlowConfigsMap = messageUASession.getDeliveryConfig().getSmooksResourceConfigurations();
- Iterator mapIterator = messageFlowConfigsMap.entrySet().iterator();
+ messageExchangeConfigsMap = messageUASession.getDeliveryConfig().getSmooksResourceConfigurations();
+ Iterator mapIterator = messageExchangeConfigsMap.entrySet().iterator();
while(mapIterator.hasNext()) {
Entry mapEntry = (Entry)mapIterator.next();
List selectorResourceList = (List)mapEntry.getValue();
for(Object resourceConfig : selectorResourceList) {
if(resourceConfig instanceof DBLinkedSmooksResourceConfiguration) {
- messageFlowConfigsList.add(((DBLinkedSmooksResourceConfiguration)resourceConfig).persistedConfigForm);
+ messageExchangeConfigsList.add(((DBLinkedSmooksResourceConfiguration)resourceConfig).persistedConfigForm);
}
}
}
- return messageFlowConfigsList;
+ return messageExchangeConfigsList;
}
/**
- * Get the Smooks "profiles" that correspond to the supplied message flow.
- * @param messageFlow The message flow.
+ * Get the Smooks "profiles" that correspond to the supplied message exchange.
+ * @param messageExchange The message exchange.
* @return List of profiles.
*/
- private static String[] getMessageFlowProfiles(MessageFlow messageFlow) {
+ private static String[] getMessageExchangeProfiles(MessageExchange messageExchange) {
String[] profilesArray;
List<String> profiles = new ArrayList<String>();
- if(messageFlow.getFromMessageType() != null) {
- profiles.add(MessageFlow.FROM_TYPE + messageFlow.getFromMessageType());
+ if(messageExchange.getFromMessageType() != null) {
+ profiles.add(MessageExchange.FROM_TYPE + messageExchange.getFromMessageType());
}
- if(messageFlow.getFromEPR() != null) {
- profiles.add(MessageFlow.FROM_EPR + messageFlow.getFromEPR());
+ if(messageExchange.getFrom() != null) {
+ profiles.add(MessageExchange.FROM + messageExchange.getFrom());
}
- if(messageFlow.getToEPR() != null) {
- profiles.add(MessageFlow.TO_EPR + messageFlow.getToEPR());
+ if(messageExchange.getTo() != null) {
+ profiles.add(MessageExchange.TO + messageExchange.getTo());
}
- if(messageFlow.getToMessageType() != null) {
- profiles.add(MessageFlow.TO_TYPE + messageFlow.getToMessageType());
+ if(messageExchange.getToMessageType() != null) {
+ profiles.add(MessageExchange.TO_TYPE + messageExchange.getToMessageType());
}
if(profiles.isEmpty()) {
Modified: labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksUtilsTest.java
===================================================================
--- labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksUtilsTest.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksUtilsTest.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -24,9 +24,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.soa.esb.admin.console.EPR;
import org.jboss.soa.esb.admin.console.contract.MessageContract;
-import org.jboss.soa.esb.admin.console.transform.flow.MessageFlow;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
+import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
import junit.framework.TestCase;
@@ -36,21 +36,21 @@
public class SmooksUtilsTest extends TestCase {
/*
- * Test method for 'org.jboss.soa.esb.admin.console.transform.SmooksUtils.getMessageFlowConfigs(MessageFlow, List<TransformationResource>)'
+ * Test method for 'org.jboss.soa.esb.admin.console.transform.SmooksUtils.getMessageExchangeConfigs(MessageExchange, List<TransformationResource>)'
*/
- public void test_getMessageFlowConfigs() {
- MessageFlow flow = new MessageFlow();
+ public void test_getMessageExchangeConfigs() {
+ MessageExchange flow = new MessageExchange();
List<TransformationResource> allResources = new ArrayList<TransformationResource>();
List<TransformationResource> flowResources;
TransformationResource resource;
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "A");
+ resource.setUseragent(MessageExchange.FROM + "A");
resource.setSelector("header");
allResources.add(resource);
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "A AND " + MessageFlow.TO_EPR + "B");
+ resource.setUseragent(MessageExchange.FROM + "A AND " + MessageExchange.TO + "B");
resource.setSelector("header");
allResources.add(resource);
@@ -60,36 +60,36 @@
allResources.add(resource);
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "B");
+ resource.setUseragent(MessageExchange.FROM + "B");
resource.setSelector("body");
allResources.add(resource);
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "B AND " + MessageFlow.TO_TYPE + "text/xml");
+ resource.setUseragent(MessageExchange.FROM + "B AND " + MessageExchange.TO_TYPE + "text/xml");
resource.setSelector("body");
allResources.add(resource);
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "B AND " + "not:" + MessageFlow.FROM_TYPE + "text/xml");
+ resource.setUseragent(MessageExchange.FROM + "B AND " + "not:" + MessageExchange.FROM_TYPE + "text/xml");
resource.setSelector("body");
allResources.add(resource);
resource = new TransformationResource();
- resource.setUseragent(MessageFlow.FROM_EPR + "C");
+ resource.setUseragent(MessageExchange.FROM + "C");
resource.setSelector("legs");
allResources.add(resource);
// Set the flow and run some tests...
- flow.setFromEPR(new EPR("A"));
- flowResources = SmooksUtils.getMessageFlowConfigs(flow, allResources);
+ flow.setFrom(new Participant("A"));
+ flowResources = SmooksUtils.getMessageExchangeConfigs(flow, allResources);
assertEquals(2, flowResources.size());
assertEquals(allResources.get(0), flowResources.get(0)); // 1st
assertEquals(allResources.get(2), flowResources.get(1)); // 3rd - useragent="*"
// Change the flow and run some more tests...
- flow.setFromEPR(new EPR("A"));
- flow.setToEPR(new EPR("B"));
- flowResources = SmooksUtils.getMessageFlowConfigs(flow, allResources);
+ flow.setFrom(new Participant("A"));
+ flow.setTo(new Participant("B"));
+ flowResources = SmooksUtils.getMessageExchangeConfigs(flow, allResources);
assertEquals(3, flowResources.size());
assertEquals(allResources.get(1), flowResources.get(0)); // 2nd - useragent expression is more specific
assertEquals(allResources.get(0), flowResources.get(1)); // 1st
@@ -98,18 +98,18 @@
flow.reset();
// Change the flow and run some more tests...
- flow.setFromEPR(new EPR("B"));
+ flow.setFrom(new Participant("B"));
flow.setFromMessageType(new MessageContract("text/xml", null, null));
- flowResources = SmooksUtils.getMessageFlowConfigs(flow, allResources);
+ flowResources = SmooksUtils.getMessageExchangeConfigs(flow, allResources);
assertEquals(2, flowResources.size());
assertEquals(allResources.get(3), flowResources.get(0)); // 4th
assertEquals(allResources.get(2), flowResources.get(1)); // 3rd - useragent="*"
// Change the flow and run some more tests...
- flow.setFromEPR(new EPR("B"));
+ flow.setFrom(new Participant("B"));
flow.setFromMessageType(new MessageContract("text/xml", null, null));
flow.setToMessageType(new MessageContract("text/xml", null, null));
- flowResources = SmooksUtils.getMessageFlowConfigs(flow, allResources);
+ flowResources = SmooksUtils.getMessageExchangeConfigs(flow, allResources);
assertEquals(3, flowResources.size());
assertEquals(allResources.get(4), flowResources.get(0)); // 5th
assertEquals(allResources.get(3), flowResources.get(1)); // 4th
Modified: labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/flow/MessageContractTest.java
===================================================================
--- labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/flow/MessageContractTest.java 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/flow/MessageContractTest.java 2006-11-23 15:11:15 UTC (rev 7796)
@@ -21,8 +21,9 @@
package org.jboss.soa.esb.admin.console.transform.flow;
-import org.jboss.soa.esb.admin.console.EPR;
import org.jboss.soa.esb.admin.console.contract.MessageContract;
+import org.jboss.soa.esb.admin.console.exchange.MessageExchange;
+import org.jboss.soa.esb.admin.console.exchange.participant.Participant;
import junit.framework.TestCase;
@@ -31,35 +32,35 @@
*/
public class MessageContractTest extends TestCase {
- public void test_getFlowUseragentString_and_getFlowUseragentStringAsHtml_getFlowAsHtml() {
- MessageFlow flow = new MessageFlow();
+ public void test_getExchangeUseragentString_and_getExchangeUseragentStringAsHtml_getExchangeAsHtml() {
+ MessageExchange flow = new MessageExchange();
- flow.setFromEPR(new EPR("jms://x.y"));
+ flow.setFrom(new Participant("jms://x.y"));
flow.setFromMessageType(new MessageContract("text/xml", null, null));
- flow.setToEPR(new EPR("file://x.y"));
+ flow.setTo(new Participant("file://x.y"));
flow.setToMessageType(new MessageContract("text/xml", null, null));
- assertEquals("from-type:text/xml AND from-epr:jms://x.y AND to-type:text/xml AND to-epr:file://x.y", flow.getFlowUseragentString());
- assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from-epr:</b>jms://x.y<br/>AND<br/><b>to-type:</b>text/xml<br/>AND<br/><b>to-epr:</b>file://x.y", flow.getFlowUseragentStringAsHtml());
- assertEquals("<b>from-type:</b> text/xml<br/><b>from-epr:</b> jms://x.y<br/><b>to-type:</b> text/xml<br/><b>to-epr:</b> file://x.y", flow.getFlowAsHtml());
+ assertEquals("from-type:text/xml AND from:jms://x.y AND to-type:text/xml AND to:file://x.y", flow.getExchangeUseragentString());
+ assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from:</b>jms://x.y<br/>AND<br/><b>to-type:</b>text/xml<br/>AND<br/><b>to:</b>file://x.y", flow.getExchangeUseragentStringAsHtml());
+ assertEquals("<b>from-type:</b> text/xml<br/><b>from:</b> jms://x.y<br/><b>to-type:</b> text/xml<br/><b>to:</b> file://x.y", flow.getExchangeAsHtml());
- flow.setToEPR(null);
- assertEquals("from-type:text/xml AND from-epr:jms://x.y AND to-type:text/xml", flow.getFlowUseragentString());
- assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from-epr:</b>jms://x.y<br/>AND<br/><b>to-type:</b>text/xml<br/>AND<br/><b>to-epr:</b>*", flow.getFlowUseragentStringAsHtml());
- assertEquals("<b>from-type:</b> text/xml<br/><b>from-epr:</b> jms://x.y<br/><b>to-type:</b> text/xml<br/><b>to-epr:</b> *", flow.getFlowAsHtml());
+ flow.setTo(null);
+ assertEquals("from-type:text/xml AND from:jms://x.y AND to-type:text/xml", flow.getExchangeUseragentString());
+ assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from:</b>jms://x.y<br/>AND<br/><b>to-type:</b>text/xml<br/>AND<br/><b>to:</b>*", flow.getExchangeUseragentStringAsHtml());
+ assertEquals("<b>from-type:</b> text/xml<br/><b>from:</b> jms://x.y<br/><b>to-type:</b> text/xml<br/><b>to:</b> *", flow.getExchangeAsHtml());
flow.setToMessageType(null);
- assertEquals("from-type:text/xml AND from-epr:jms://x.y", flow.getFlowUseragentString());
- assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from-epr:</b>jms://x.y<br/>AND<br/><b>to-type:</b>*<br/>AND<br/><b>to-epr:</b>*", flow.getFlowUseragentStringAsHtml());
- assertEquals("<b>from-type:</b> text/xml<br/><b>from-epr:</b> jms://x.y<br/><b>to-type:</b> *<br/><b>to-epr:</b> *", flow.getFlowAsHtml());
+ assertEquals("from-type:text/xml AND from:jms://x.y", flow.getExchangeUseragentString());
+ assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from:</b>jms://x.y<br/>AND<br/><b>to-type:</b>*<br/>AND<br/><b>to:</b>*", flow.getExchangeUseragentStringAsHtml());
+ assertEquals("<b>from-type:</b> text/xml<br/><b>from:</b> jms://x.y<br/><b>to-type:</b> *<br/><b>to:</b> *", flow.getExchangeAsHtml());
- flow.setFromEPR(null);
- assertEquals("from-type:text/xml", flow.getFlowUseragentString());
- assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from-epr:</b>*<br/>AND<br/><b>to-type:</b>*<br/>AND<br/><b>to-epr:</b>*", flow.getFlowUseragentStringAsHtml());
- assertEquals("<b>from-type:</b> text/xml<br/><b>from-epr:</b> *<br/><b>to-type:</b> *<br/><b>to-epr:</b> *", flow.getFlowAsHtml());
+ flow.setFrom(null);
+ assertEquals("from-type:text/xml", flow.getExchangeUseragentString());
+ assertEquals("<b>from-type:</b>text/xml<br/>AND<br/><b>from:</b>*<br/>AND<br/><b>to-type:</b>*<br/>AND<br/><b>to:</b>*", flow.getExchangeUseragentStringAsHtml());
+ assertEquals("<b>from-type:</b> text/xml<br/><b>from:</b> *<br/><b>to-type:</b> *<br/><b>to:</b> *", flow.getExchangeAsHtml());
flow.setFromMessageType(null);
- assertEquals("*", flow.getFlowUseragentString());
- assertEquals("All Messages", flow.getFlowUseragentStringAsHtml());
+ assertEquals("*", flow.getExchangeUseragentString());
+ assertEquals("All Messages", flow.getExchangeUseragentStringAsHtml());
}
}
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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/contract/list-message-contracts.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -13,24 +13,25 @@
<h:form>
<h2>Manage Message Contracts</h2>
<div class="section">
- This wizard lists all defined Message Contracts.
+ This wizard allows you define details about a message <b>produced</b> or <b>consumed</b> by one of the
+ message Transformation "<h:commandLink action="/participants/index.xhtml">Participants</h:commandLink>"
</div>
<div class="section">
<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">Endpoint Logical Name</f:facet>
+ <f:facet name="header">Participant Name (Message Producer/Consumer)</f:facet>
#{contractSelection.epr}
</h:column>
<h:column>
+ <f:facet name="header">Usage</f:facet>
+ #{contractSelection.usage}
+ </h:column>
+ <h:column>
<f:facet name="header">Namespace</f:facet>
#{contractSelection.namespace}
</h:column>
<h:column>
- <f:facet name="header">Usage</f:facet>
- #{contractSelection.usage}
- </h:column>
- <h:column>
<f:facet name="header">MIME Type</f:facet>
#{contractSelection.mime}
</h:column>
Added: labs/jbossesb/trunk/product/console/view/participant/index.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/participant/index.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/participant/index.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -0,0 +1,32 @@
+<!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>What is a Message Transformation Participant?</h2>
+ </div>
+ <div class="section">
+ Within the context of JBoss ESB, a message transformation is performed in order to make a messages "produced" by one entity "<i>A</i>",
+ "consumable" by another entity "<i>B</i>". Within JBoss ESB, we refer to these entities as Transformation "Participants".
+ We specifically do not use the name "Service" or "Endpoint" simply because we acknowledge the fact that transformations often need to
+ happen in all sorts of scenarios and between all sorts of "participants".
+ <p/>
+ All JBoss ESB Transformations are defined with respect to 2 Participants:
+ <ol>
+ <li>The Message <b>Producer</b>, and</li>
+ <li>The Message <b>Consumer</b></li>
+ </ol>
+ </div>
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+</ui:define>
+
+</ui:composition>
Added: labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/participant/manage-participants.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -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> </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/participant/template.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/participant/template.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/participant/template.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -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="../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/transform/add-resource-parameter.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -57,10 +57,10 @@
<!-- sidebar -->
<ui:define name="sidebar">
- <b><h:form><h:commandButton value="Set Message Flow" action="#{messageFlowSelect.showFromEPRs}" /></h:form></b>
+ <b><h:form><h:commandButton value="Set Message Exchange" action="#{messageExchangeSelect.showFromEPRs}" /></h:form></b>
<p/>
<h1>Create Transformation/Analysis Configuration</h1>
- Create a message transformation/analysis configuration for the chosen Message Flow.
+ Create a message transformation/analysis configuration for the chosen Message Exchange.
<p/>
</ui:define>
Modified: labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/list-resources.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -17,9 +17,9 @@
</div>
<div class="section">
<div class="entry">
- <div class="label"><h:outputLabel for="MessageFlow">Selected Message Flow:</h:outputLabel></div>
+ <div class="label"><h:outputLabel for="MessageExchange">Selected Message Exchange:</h:outputLabel></div>
<div class="output">
- <f:verbatim id="MessageFlow">#{messageFlow.flowAsHtml}</f:verbatim>
+ <f:verbatim id="MessageExchange">#{messageExchange.flowAsHtml}</f:verbatim>
</div>
</div>
</div>
@@ -29,8 +29,8 @@
<h:outputText value="Narrow List" rendered="#{showAll.on}"/>
</h:commandLink>
<br/>
- <h:outputText value='There are no Resource Configurations targeted directly at the current Message Flow. Click "Show All" to see resources that are targeted indirectly.' rendered="#{messageFlowConfigs != null and messageFlowConfigs.rowCount==0}"/>
- <h:dataTable value="#{messageFlowConfigs}" var="configSelection" rendered="#{messageFlowConfigs.rowCount>0}">
+ <h:outputText value='There are no Resource Configurations targeted directly at the current Message Exchange. Click "Show All" to see resources that are targeted indirectly.' rendered="#{messageExchangeConfigs != null and messageExchangeConfigs.rowCount==0}"/>
+ <h:dataTable value="#{messageExchangeConfigs}" var="configSelection" rendered="#{messageExchangeConfigs.rowCount>0}">
<h:column>
<f:facet name="header">Execution Selector</f:facet>
#{configSelection.selector}
@@ -59,7 +59,7 @@
<!-- sidebar -->
<ui:define name="sidebar">
- <b><h:form><h:commandButton value="Set Message Flow" action="#{messageFlowSelect.showFromEPRs}" /></h:form></b>
+ <b><h:form><h:commandButton value="Set Message Exchange" action="#{messageExchangeSelect.showFromEPRs}" /></h:form></b>
<p/>
</ui:define>
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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-select-spec.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -49,10 +49,10 @@
<!-- sidebar -->
<ui:define name="sidebar">
- <b><h:form><h:commandButton value="Set Message Flow" action="#{messageFlowSelect.showFromEPRs}" /></h:form></b>
+ <b><h:form><h:commandButton value="Set Message Exchange" action="#{messageExchangeSelect.showFromEPRs}" /></h:form></b>
<p/>
<h1>Create Transformation/Analysis Configuration</h1>
- Create a message transformation/analysis configuration for the chosen Message Flow.
+ Create a message transformation/analysis configuration for the chosen Message Exchange.
<p/>
</ui:define>
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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -16,7 +16,7 @@
<div class="section">
The new Transformation/Analysis configuration needs to be targeted at a specific "Message Useragent" and execution "Selector" combination. The
Message Useragent field defines an expression that identifies the physical message at which the transformation/analysis configuration is to be targeted. This has already been
- defined through setting of the Message Flow (but can be manually modified). Defining the execution "Selector" depends on the actual transformation/analysis resource.
+ defined through setting of the Message Exchange (but can be manually modified). Defining the execution "Selector" depends on the actual transformation/analysis resource.
If the resource is a unit of Java/XSLT/etc logic for performing an XML transformation on an XML Fragment, the "Selector"
will be the XML element name (possibly contextual). See <a href="http://milyn.codehaus.org/javadoc/smooks">SmooksResourceConfiguration</a>.
</div>
@@ -70,10 +70,10 @@
<!-- sidebar -->
<ui:define name="sidebar">
- <b><h:form><h:commandButton value="Set Message Flow" action="#{messageFlowSelect.showFromEPRs}" /></h:form></b>
+ <b><h:form><h:commandButton value="Set Message Exchange" action="#{messageExchangeSelect.showFromEPRs}" /></h:form></b>
<p/>
<h1>Create Transformation/Analysis Configuration</h1>
- Create a message transformation/analysis configuration for the chosen Message Flow.
+ Create a message transformation/analysis configuration for the chosen Message Exchange.
<p/>
</ui:define>
Deleted: 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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-from-epr.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,54 +0,0 @@
-<!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>
- <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 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 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> </f:verbatim></f:facet>
- <h:outputText value="+" rendered="#{eprFromSelection.id==messageFlow.fromEPR.id}"/>
- </h:column>
- <h:column>
- <f:facet name="header">From Endpoints (Logical Name)</f:facet>
- <s:link action="#{messageFlowSelect.selectFromEPR}" value="#{eprFromSelection.uri}" />
- </h:column>
- </h:dataTable>
- </div>
-
- <div class="section">
- <h:commandButton value="Continue..." action="#{messageFlowSelect.showFromTypes}" class="button" />
- </div>
- <div class="section">
- <h:commandButton value="Cancel" action="#{messageFlowSelect.cancel}" class="button" />
- </div>
-
- </h:form>
-</ui:define>
-
-<!-- sidebar -->
-<ui:define name="sidebar">
- <h1>Select Message Flow</h1>
- <p>
- Select the message flow on which you would like to perform message transformation configurations.
- </p>
-</ui:define>
-
-</ui:composition>
\ No newline at end of file
Deleted: 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-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/select-message-flow-to-epr.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -1,46 +0,0 @@
-<!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>
- <h2>Select Message Flow : <i>To Endpoint...</i></h2>
-
- <div class="section">
- <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> </f:verbatim></f:facet>
- <h:outputText value="+" rendered="#{eprToSelection.id==messageFlow.toEPR.id}"/>
- </h:column>
- <h:column>
- <f:facet name="header">To Endpoints (Logical Name)</f:facet>
- <s:link action="#{messageFlowSelect.selectToEPR}" value="#{eprToSelection.uri}" />
- </h:column>
- </h:dataTable>
- </div>
-
- <div class="section">
- <h:commandButton value="Continue..." action="#{messageFlowSelect.showToTypes}" class="button" />
- </div>
- <div class="section">
- <h:commandButton value="Cancel" action="#{messageFlowSelect.cancel}" class="button" />
- </div>
-
- </h:form>
-</ui:define>
-
-<!-- sidebar -->
-<ui:define name="sidebar">
- <h1>Select Message Flow</h1>
- <p>
- Select the message flow on which you would like to perform message transformation configurations.
- </p>
-</ui:define>
-
-</ui:composition>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml 2006-11-23 14:57:32 UTC (rev 7795)
+++ labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml 2006-11-23 15:11:15 UTC (rev 7796)
@@ -63,7 +63,7 @@
<!-- sidebar -->
<ui:define name="sidebar">
- <b><h:form><h:commandButton value="Set Message Flow" action="#{messageFlowSelect.showFromEPRs}" /></h:form></b>
+ <b><h:form><h:commandButton value="Set Message Exchange" action="#{messageExchangeSelect.showFromEPRs}" /></h:form></b>
<p/>
</ui:define>
More information about the jboss-svn-commits
mailing list