Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ofbiz.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r910385 - in
 /ofbiz/trunk/framework/service/src/org/ofbiz/service/jms:
 JmsSerializer.java JmsServiceEngine.java
Date: Tue, 16 Feb 2010 03:38:41 -0000
To: commits@ofbiz.apache.org
From: adrianc@apache.org
Message-Id: <20100216033842.1269E23889F1@eris.apache.org>

Author: adrianc
Date: Tue Feb 16 03:38:41 2010
New Revision: 910385

URL: http://svn.apache.org/viewvc?rev=910385&view=rev
Log:
Created a JMS serializer facade class to decouple JMS code from XmlSerializer.

Added:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java   (with props)
Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java

Added: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java?rev=910385&view=auto
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java (added)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java Tue Feb 16 03:38:41 2010
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+package org.ofbiz.service.jms;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.serialize.SerializeException;
+import org.ofbiz.entity.serialize.XmlSerializer;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+/**
+ * A facade class used to connect JMS code to the legacy XML serialization code.
+ *
+ */
+public class JmsSerializer {
+    public static final String module = JmsSerializer.class.getName();
+
+    public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException {
+        Document document = UtilXml.readXmlDocument(content, false);
+        if (document != null) {
+            return XmlSerializer.deserialize(document, delegator);
+        } else {
+            Debug.logWarning("Serialized document came back null", module);
+            return null;
+        }
+    }
+
+    public static String serialize(Object object) throws SerializeException, FileNotFoundException, IOException {
+        Document document = UtilXml.makeEmptyXmlDocument("ofbiz-ser");
+        Element rootElement = document.getDocumentElement();
+        rootElement.appendChild(XmlSerializer.serializeSingle(object, document));
+        return UtilXml.writeXmlDocument(document);
+    }
+}

Propchange: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsSerializer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java?rev=910385&r1=910384&r2=910385&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java Tue Feb 16 03:38:41 2010
@@ -51,7 +51,6 @@
 import org.ofbiz.base.util.JNDIContextFactory;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.serialize.XmlSerializer;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
 import org.ofbiz.service.GenericRequester;
@@ -103,7 +102,7 @@
 
         try {
             if (Debug.verboseOn()) Debug.logVerbose("Serializing Context --> " + context, module);
-            xmlContext = XmlSerializer.serialize(context);
+            xmlContext = JmsSerializer.serialize(context);
         } catch (Exception e) {
             throw new GenericServiceException("Cannot serialize context.", e);
         }