[jboss-svn-commits] JBL Code SVN: r7568 - in labs/jbossesb/trunk/product/console: . resources/WEB-INF/classes src/org/jboss/soa/esb/admin/console/transform test/src/org/jboss/soa/esb/admin/console/transform view/transform
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 13 12:53:04 EST 2006
Author: tfennelly
Date: 2006-11-13 12:52:55 -0500 (Mon, 13 Nov 2006)
New Revision: 7568
Modified:
labs/jbossesb/trunk/product/console/build.properties
labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml
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/SmooksResourceListConverter.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResource.java
labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResourceParameter.java
labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverterTest.java
labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml
labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-create.xhtml
labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
Log:
Sorted out the resource<->resource-parameter associations and persistence
Modified: labs/jbossesb/trunk/product/console/build.properties
===================================================================
--- labs/jbossesb/trunk/product/console/build.properties 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/build.properties 2006-11-13 17:52:55 UTC (rev 7568)
@@ -1 +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
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/hibernate.cfg.xml 2006-11-13 17:52:55 UTC (rev 7568)
@@ -17,5 +17,6 @@
<mapping class="org.jboss.soa.esb.admin.console.EPR"/>
<mapping class="org.jboss.soa.esb.admin.console.contract.MessageContract"/>
<mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResource"/>
+ <mapping class="org.jboss.soa.esb.admin.console.transform.TransformationResourceParameter"/>
</session-factory>
</hibernate-configuration>
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-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/ManageResources.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -77,13 +77,16 @@
public String viewConfiguration() {
selectedConfig = messageFlowConfigs.get(messageFlowConfigIndex);
- selectedConfigParams = Arrays.asList(selectedConfig.getParameters());
+ selectedConfigParams = selectedConfig.getParameters();
return "view-resource";
}
public String deleteConfiguration() {
selectedConfig = messageFlowConfigs.get(messageFlowConfigIndex);
+ for(TransformationResourceParameter parameter : selectedConfig.getParameters()) {
+ esbDatabase.delete(parameter);
+ }
esbDatabase.delete(selectedConfig);
initialise();
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-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/NewResource.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -71,20 +71,14 @@
transResource = new TransformationResource();
transResource.setUseragent(messageFlow.getFlowUseragentString());
- parameterList = null;
- initParameterList();
+ parameterList = new ArrayList<TransformationResourceParameter>();
+ transResource.setParameters(parameterList);
return "new-trans-resource-create";
}
-
- public void initParameterList() {
- if(parameterList == null) {
- parameterList = new ArrayList<TransformationResourceParameter>();
- }
- }
public String addParameter() {
- parameterList.add(transResourceParameter);
+ parameterList.add(transResourceParameter);
transResourceParameter = new TransformationResourceParameter();
return "new-trans-resource-create";
@@ -97,14 +91,12 @@
@End
public String save() {
try {
- TransformationResourceParameter[] paramArray = new TransformationResourceParameter[parameterList.size()];
-
- // Set the parameter set...
- parameterList.toArray(paramArray);
- transResource.setParameters(paramArray);
-
// Persist...
esbDatabase.persist(transResource);
+ for(TransformationResourceParameter parameter : transResource.getParameters()) {
+ parameter.setTransResource(transResource);
+ esbDatabase.persist(parameter);
+ }
return "home";
} catch(Throwable thrown) {
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverter.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -84,19 +84,19 @@
}
stringBuffer.append(">");
- TransformationResourceParameter[] parameters = resource.getParameters();
- if(parameters != null && parameters.length > 0) {
+ List<TransformationResourceParameter> parameters = resource.getParameters();
+ if(parameters != null && !parameters.isEmpty()) {
appendParameters(parameters, stringBuffer);
}
stringBuffer.append("\n\t</smooks-resource>");
}
- private static void appendParameters(TransformationResourceParameter[] parameters, StringBuffer stringBuffer) {
+ private static void appendParameters(List<TransformationResourceParameter> parameters, StringBuffer stringBuffer) {
for(TransformationResourceParameter param : parameters) {
stringBuffer.append("\n\t\t<param name=\"").append(param.getName()).append("\">");
stringBuffer.append("<![CDATA[");
- stringBuffer.append(param.getValue());
+ stringBuffer.append(param.getValueAsString());
stringBuffer.append("]]>");
stringBuffer.append("</param>");
}
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResource.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResource.java 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResource.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -22,16 +22,19 @@
package org.jboss.soa.esb.admin.console.transform;
import java.io.Serializable;
+import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.OneToMany;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.validator.NotNull;
import org.jboss.seam.annotations.Name;
/**
+ * Transformation resource.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
@Entity
@@ -44,7 +47,7 @@
private String selector;
private String namespace;
private String path;
- private TransformationResourceParameter[] parameters;
+ private List<TransformationResourceParameter> parameters;
/**
* @return Returns the id.
@@ -89,14 +92,15 @@
/**
* @return Returns the parameters.
*/
- public TransformationResourceParameter[] getParameters() {
+ @OneToMany(mappedBy="transResource")
+ public List<TransformationResourceParameter> getParameters() {
return parameters;
}
/**
* @param parameters The parameters to set.
*/
- public void setParameters(TransformationResourceParameter[] properties) {
- this.parameters = properties;
+ public void setParameters(List<TransformationResourceParameter> parameters) {
+ this.parameters = parameters;
}
/**
* @return Returns the selector.
Modified: labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResourceParameter.java
===================================================================
--- labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResourceParameter.java 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/src/org/jboss/soa/esb/admin/console/transform/TransformationResourceParameter.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -23,9 +23,13 @@
import java.io.Serializable;
+import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Transient;
+import org.hibernate.annotations.GenericGenerator;
import org.hibernate.validator.NotNull;
import org.jboss.seam.annotations.Name;
@@ -33,20 +37,54 @@
* Transformation Resource Parameter.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
+ at Entity
@Name("transResourceParameter")
public class TransformationResourceParameter implements Serializable {
private static final long serialVersionUID = 1L;
+ private String id;
+ private TransformationResource transResource;
private String name;
- private String value;
+ private byte[] value;
public TransformationResourceParameter() {
}
public TransformationResourceParameter(String name, String value) {
this.name = name;
- this.value = value;
+ setValueAsString(value);
}
+
+ /**
+ * @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;
+ }
+
+ /**
+ * @return Returns the transResource.
+ */
+ @ManyToOne
+ public TransformationResource getTransResource() {
+ return transResource;
+ }
+
+ /**
+ * @param transResource The transResource to set.
+ */
+ public void setTransResource(TransformationResource transResource) {
+ this.transResource = transResource;
+ }
/**
* @return Returns the name.
@@ -62,16 +100,37 @@
this.name = name;
}
/**
+ * @return Returns the valueAsString.
+ */
+ @NotNull
+ @Transient
+ public String getValueAsString() {
+ if(value == null) {
+ return null;
+ }
+ return new String(value);
+ }
+ /**
+ * @param valueAsString The valueAsString to set.
+ */
+ public void setValueAsString(String value) {
+ if(value == null) {
+ this.value = null;
+ }
+ this.value = value.getBytes();
+ }
+
+ /**
* @return Returns the value.
*/
- @NotNull
- public String getValue() {
+ public byte[] getValue() {
return value;
}
+
/**
* @param value The value to set.
*/
- public void setValue(String value) {
+ public void setValue(byte[] value) {
this.value = value;
}
}
Modified: labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverterTest.java
===================================================================
--- labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverterTest.java 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/test/src/org/jboss/soa/esb/admin/console/transform/SmooksResourceListConverterTest.java 2006-11-13 17:52:55 UTC (rev 7568)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.milyn.io.StreamUtils;
@@ -46,7 +47,7 @@
res.setPath("path");
res.setSelector("selector");
res.setUseragent("ua");
- res.setParameters(new TransformationResourceParameter[] {new TransformationResourceParameter("name", "value")});
+ res.setParameters(Arrays.asList(new TransformationResourceParameter[] {new TransformationResourceParameter("name", "value")}));
transList.add(res);
transList.add(res);
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-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/view/transform/add-resource-parameter.xhtml 2006-11-13 17:52:55 UTC (rev 7568)
@@ -22,7 +22,7 @@
<div class="entry">
<div class="label"><h:outputLabel for="Value">Value:</h:outputLabel></div>
<div class="input">
- <h:inputTextarea id="Value" value="#{transResourceParameter.value}" cols="100" rows="30" required="true" />
+ <h:inputTextarea id="Value" value="#{transResourceParameter.valueAsString}" cols="100" rows="30" required="true" />
<br/><span class="errors"><h:message for="Value" /></span>
</div>
</div>
Modified: labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-create.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-create.xhtml 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/view/transform/new-trans-resource-create.xhtml 2006-11-13 17:52:55 UTC (rev 7568)
@@ -39,7 +39,7 @@
</h:column>
<h:column>
<f:facet name="header">Parameter Value</f:facet>
- <pre>#{parameterSelection.value}</pre>
+ <pre>#{parameterSelection.valueAsString}</pre>
</h:column>
</h:dataTable>
</div>
Modified: labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml
===================================================================
--- labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml 2006-11-13 17:43:43 UTC (rev 7567)
+++ labs/jbossesb/trunk/product/console/view/transform/view-resource.xhtml 2006-11-13 17:52:55 UTC (rev 7568)
@@ -45,7 +45,7 @@
</h:column>
<h:column>
<f:facet name="header">Parameter Value</f:facet>
- <pre>#{parameterSelection.value}</pre>
+ <pre>#{parameterSelection.valueAsString}</pre>
</h:column>
</h:dataTable>
</div>
More information about the jboss-svn-commits
mailing list