[jboss-svn-commits] JBL Code SVN: r7624 - in labs/jbossesb/trunk/product: console/src/org/jboss/soa/esb/admin/console/contract console/src/org/jboss/soa/esb/admin/console/transform console/view/contract console/view/transform lib/ext

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2006-11-15 13:37:18 -0500 (Wed, 15 Nov 2006)
New Revision: 7624

Added:
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-templating-0.2.jar
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/transform/SmooksUtils.java
   labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml
   labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml
Log:
Some minor bug fixes

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-15 17:48:40 UTC (rev 7623)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/contract/MessageContract.java	2006-11-15 18:37:18 UTC (rev 7624)
@@ -154,7 +154,6 @@
 	/**
 	 * @return Returns the mime.
 	 */
-	@NotNull
 	public String getMime() {
 		return mime;
 	}
@@ -205,7 +204,10 @@
 		
 		stringBuf.append(mime);
 		if(namespace != null) {
-			stringBuf.append(':').append(namespace);
+			if(mime != null && !mime.trim().equals("")) {
+				stringBuf.append(':');
+			}
+			stringBuf.append(namespace);
 		}
 		
 		return stringBuf.toString();

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-15 17:48:40 UTC (rev 7623)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksUtils.java	2006-11-15 18:37:18 UTC (rev 7624)
@@ -137,6 +137,13 @@
 					resourceConfig.getUseragent(), resourceConfig.getPath());
 			instance.persistedConfigForm = resourceConfig;
 			
+			// If there are parameters, set them too...
+			if(resourceConfig.getParameters() != null) {
+				for(TransformationResourceParameter param : resourceConfig.getParameters()) {
+					instance.setParameter(param.getName(), param.getType(), new String(param.getValue()));
+				}
+			}
+			
 			return instance;
 		}
 	}

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 17:48:40 UTC (rev 7623)
+++ labs/jbossesb/trunk/product/console/view/contract/new-message-contract.xhtml	2006-11-15 18:37:18 UTC (rev 7624)
@@ -55,7 +55,7 @@
 				<div class="entry">
 					<div class="label"><h:outputLabel for="Mime">Message Mime (e.g. text/xml):</h:outputLabel></div>
 					<div class="input">
-						<h:inputText id="Mime" value="#{contract.mime}" size="30" required="true" />
+						<h:inputText id="Mime" value="#{contract.mime}" size="30" />
 						<br/><span class="errors"><h:message for="Mime" /></span>
 					</div>
 				</div>

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 17:48:40 UTC (rev 7623)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-target.xhtml	2006-11-15 18:37:18 UTC (rev 7624)
@@ -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" size="100" disabled="#{transResource.selector != null}"/>
+							<h:inputText id="Selector" value="#{transResource.selector}" required="true" size="100" disabled="#{transResource.selector}"/>
 							<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" size="100" disabled="#{transResource.namespace != null}" />
+							<h:inputText id="Selector-Namespace" value="#{transResource.namespace}" required="false" size="100" disabled="#{transResource.namespace}" />
 							<br/><span class="errors"><h:message for="Selector-Namespace" /></span>
 						</div>
 					</div>

Added: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-templating-0.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-templating-0.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream