From f467102072d4fddf345cdec086f8fcb5d7c019b9 Mon Sep 17 00:00:00 2001
From: Benjamin Phillippe <Benjamin_D_Phillippe@raytheon.com>
Date: Wed, 21 Aug 2013 16:27:16 -0500
Subject: [PATCH] Issue #1693 Fixing dependencies

Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9

Former-commit-id: de11fc45b9a7ee69ef2017f92a9c9d2715ffb604 [formerly eebb355e810b2155259ae3ad4393a166620a1077] [formerly 0d8adcade1f3bea9e9f73359113ca796ada00e99] [formerly 2f0949aa0a786b1322116f8e5197c9fa43fb68f3 [formerly 0d8adcade1f3bea9e9f73359113ca796ada00e99 [formerly 73c647449e071c9290c7b7fa57e99490960be536]]]
Former-commit-id: 2f0949aa0a786b1322116f8e5197c9fa43fb68f3
Former-commit-id: 89aadc836192621ada769d9a7110d29964dbdcb0 [formerly 1561652425408934ec4d2da97a9fb6c07ab835a2]
Former-commit-id: 93b1969f056e299fa1ab28cef73291580718f9f1
---
 .../META-INF/MANIFEST.MF                              |  3 +--
 .../ebxml/util/xpath/RegistryXPathProcessor.java      | 11 +++++++----
 .../com.raytheon.uf.edex.registry.feature/feature.xml |  8 +-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
index 1d98486670..ef383745f3 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
@@ -34,8 +34,7 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.
  com.raytheon.uf.common.datadelivery.request;bundle-version="1.0.0",
  javax.mail;bundle-version="1.0.0",
  org.apache.commons.validator;bundle-version="1.2.0",
- com.sun.xml.bind;bundle-version="1.0.0",
- org.apache.commons.io;bundle-version="2.4.0"
+ com.sun.xml.bind;bundle-version="1.0.0"
 Export-Package: com.raytheon.uf.edex.registry.ebxml.acp,
  com.raytheon.uf.edex.registry.ebxml.dao,
  com.raytheon.uf.edex.registry.ebxml.exception,
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/xpath/RegistryXPathProcessor.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/xpath/RegistryXPathProcessor.java
index 2589a46e98..8ea8293093 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/xpath/RegistryXPathProcessor.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/xpath/RegistryXPathProcessor.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.uf.edex.registry.ebxml.util.xpath;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
@@ -26,6 +27,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.xml.bind.JAXBElement;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -41,7 +43,6 @@ import javax.xml.xpath.XPathFactory;
 
 import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.MsgRegistryException;
 
-import org.apache.commons.io.IOUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -293,8 +294,8 @@ public class RegistryXPathProcessor {
         Document domDocument = null;
         InputStream stream = null;
         try {
-            stream = IOUtils.toInputStream(jaxbManager
-                    .marshalToXml(registryObject));
+            stream = new ByteArrayInputStream(jaxbManager.marshalToXml(
+                    registryObject).getBytes("UTF-8"));
             documentBuilder.reset();
             domDocument = documentBuilder.parse(stream);
         } catch (Exception e) {
@@ -327,7 +328,9 @@ public class RegistryXPathProcessor {
         try {
             transformer.reset();
             transformer.transform(new DOMSource(doc), result);
-            return jaxbManager.unmarshalFromXml(writer.toString());
+
+            return ((JAXBElement<?>) jaxbManager.unmarshalFromXml(writer
+                    .toString())).getValue();
         } catch (Exception e) {
             throw new EbxmlRegistryException(
                     "Error converting object from dom", e);
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
index 6b28c909c2..437e873a82 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
@@ -16,7 +16,7 @@
    <license url="http://www.example.com/license">
       [Enter License Description here.]
    </license>
-   
+
    <import feature="com.raytheon.uf.edex.registry.client.feature" version="1.0.0.qualifier"/>
 
    <plugin
@@ -33,10 +33,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.commons.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>