xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1693 Fixing dependencies

Browse source 
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9

Former-commit-id: d53e730da9 [formerly de11fc45b9] [formerly eebb355e81] [formerly eebb355e81 [formerly 0d8adcade1]] [formerly 2f0949aa0a [formerly eebb355e81 [formerly 0d8adcade1] [formerly 2f0949aa0a [formerly 73c647449e071c9290c7b7fa57e99490960be536]]]]
Former-commit-id: 2f0949aa0a
Former-commit-id: 92fdb8fb4fd6138ea8497ce6889cbd7b70d8495c [formerly 89aadc836192621ada769d9a7110d29964dbdcb0] [formerly 93b1969f05 [formerly 1561652425]]
Former-commit-id: 93b1969f05
Former-commit-id: f467102072
This commit is contained in:
Benjamin Phillippe 2013-08-21 16:27:16 -05:00
parent 33da4db416
commit c997b0d115
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
View file

@ -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,

11
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/xpath/RegistryXPathProcessor.java
View file

@ -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);

8
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
View file

@ -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>