[jboss-svn-commits] JBL Code SVN: r7168 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss: internal/soa/esb/persistence/format/db soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 26 22:36:04 EDT 2006
Author: daniel.brum at jboss.com
Date: 2006-10-26 22:36:02 -0400 (Thu, 26 Oct 2006)
New Revision: 7168
Modified:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/format/db/MessageStoreImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
Log:
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/format/db/MessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/format/db/MessageStoreImpl.java 2006-10-27 02:31:59 UTC (rev 7167)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/format/db/MessageStoreImpl.java 2006-10-27 02:36:02 UTC (rev 7168)
@@ -21,35 +21,20 @@
package org.jboss.internal.soa.esb.persistence.format.db;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.Serializable;
-import java.io.StringWriter;
import java.net.URI;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-
import java.util.UUID;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-
-
import org.jboss.internal.soa.esb.thirdparty.Base64;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
import org.jboss.soa.esb.persistence.MessageStore;
+import org.jboss.soa.esb.util.Util;
-import org.w3c.dom.Document;
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
-
public class MessageStoreImpl implements MessageStore {
@@ -64,7 +49,7 @@
public synchronized URI addMessage(Message message){
- String messageString = null;
+// String messageString = null;
URI uid = null;
@@ -73,21 +58,23 @@
uid = new URI("urn:jboss:esb:message:UID:" + UUID.randomUUID().toString());
- if (message.getType().equals(MessageType.JBOSS_XML) ) {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- ((org.jboss.internal.soa.esb.message.format.xml.MessageImpl)message).toXML(doc);
- StringWriter sWriter = new StringWriter();
- OutputFormat format = new OutputFormat();
- format.setIndenting(true);
- XMLSerializer xmlS = new XMLSerializer(sWriter, format);
- xmlS.asDOMSerializer();
- xmlS.serialize(doc);
- messageString = sWriter.toString();
- }
+ String messageString = Base64.encodeObject(Util.serialize(message));
- if (message.getType().equals(MessageType.JAVA_SERIALIZED) ) {
- messageString = Base64.encodeObject((Serializable)message);
- }
+// if (message.getType().equals(MessageType.JBOSS_XML) ) {
+// Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+// ((org.jboss.internal.soa.esb.message.format.xml.MessageImpl)message).toXML(doc);
+// StringWriter sWriter = new StringWriter();
+// OutputFormat format = new OutputFormat();
+// format.setIndenting(true);
+// XMLSerializer xmlS = new XMLSerializer(sWriter, format);
+// xmlS.asDOMSerializer();
+// xmlS.serialize(doc);
+// messageString = sWriter.toString();
+// }
+//
+// if (message.getType().equals(MessageType.JAVA_SERIALIZED) ) {
+// messageString = Base64.encodeObject((Serializable)message);
+// }
//insert into the database
String sql = "insert into message(uid, type, message) values(?,?,?)";
@@ -115,28 +102,29 @@
rs = ps.executeQuery();
if (! rs.next()) throw new Exception("Non existing Message for UID: " + uid);
- URI type= URI.create(rs.getString(2));
- String msg=rs.getString(3);
+// URI type= URI.create(rs.getString(2));
+ message = Util.deserialize((Serializable)Base64.decodeToObject(rs.getString(3)));
- if (type.equals(MessageType.JBOSS_XML)) {
-
- InputStream inStream = new ByteArrayInputStream(msg.getBytes());
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.parse(inStream);
-
- org.jboss.internal.soa.esb.message.format.xml.MessageImpl xmlMessage =
- new org.jboss.internal.soa.esb.message.format.xml.MessageImpl();
- xmlMessage.fromXML(doc);
- message=xmlMessage;
-
- }
- if (type.equals(MessageType.JAVA_SERIALIZED)) {
-
- Object byteMessage = Base64.decodeToObject(msg);
- message = (org.jboss.internal.soa.esb.message.format.serialized.MessageImpl)byteMessage;
- }
+// if (type.equals(MessageType.JBOSS_XML)) {
+//
+// InputStream inStream = new ByteArrayInputStream(msg.getBytes());
+// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+// DocumentBuilder builder = factory.newDocumentBuilder();
+// Document doc = builder.parse(inStream);
+//
+// org.jboss.internal.soa.esb.message.format.xml.MessageImpl xmlMessage =
+// new org.jboss.internal.soa.esb.message.format.xml.MessageImpl();
+// xmlMessage.fromXML(doc);
+// message=xmlMessage;
+//
+// }
+// if (type.equals(MessageType.JAVA_SERIALIZED)) {
+//
+// Object byteMessage = Base64.decodeToObject(msg);
+// message = (org.jboss.internal.soa.esb.message.format.serialized.MessageImpl)byteMessage;
+// }
+
} catch (SQLException e) {
e.printStackTrace();
return null;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java 2006-10-27 02:31:59 UTC (rev 7167)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java 2006-10-27 02:36:02 UTC (rev 7168)
@@ -46,6 +46,7 @@
import org.jboss.soa.esb.common.ModulePropertyManager;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -160,9 +161,10 @@
public static Message deserialize(Serializable serial)
throws ParserConfigurationException,SAXException,IOException
{
- if (serial instanceof MessageImpl)
+ if (serial instanceof MessageImpl) //MessageType.JAVA_SERIALIZED
return (Message)serial;
+ //MessageType.JBOSS_XML
InputStream inStream = new ByteArrayInputStream(((String)serial).getBytes());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
More information about the jboss-svn-commits
mailing list