From 2beded5445fb86f1b8d46b6594cad1b5ba962690 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 30 Aug 2011 18:03:49 +0000
Subject: Update to sjsxp 1.0.2

This version doesn't support creating an XMLEventReader from a StreamSource


git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@964 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/pom.xml                                                  | 2 +-
 .../test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java  | 7 +++----
 utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java       | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d16cbcc3..3b915b66 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -125,7 +125,7 @@
     <dependency>
       <artifactId>sjsxp</artifactId>
       <groupId>com.sun.xml.stream</groupId>
-      <version>1.0.1</version>
+      <version>1.0.2</version>
     </dependency>
         <!--
          |   Applet-only dependencies (put in provided scope)
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
index 435ae92e..d95216fa 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.Reader;
 import java.io.StringReader;
 
-import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Before;
@@ -65,7 +64,7 @@ public class SLCommandFactoryTest {
   public void createNullOperationCommand() throws SLCommandException, SLRuntimeException, SLRequestException, SLVersionException {
     Reader requestReader = new StringReader(
         "<NullOperationRequest xmlns=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2#\"/>");
-    Source source = new StreamSource(requestReader);
+    StreamSource source = new StreamSource(requestReader);
     
     SLCommand slCommand = factory.createSLCommand(source);
     
@@ -76,7 +75,7 @@ public class SLCommandFactoryTest {
   public void createUnsupportedCommand() throws SLCommandException, SLRuntimeException, SLRequestException, SLVersionException {
     Reader requestReader = new StringReader(
       "<CreateCMSSignatureRequest xmlns=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2#\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2# file:/home/clemens/IAIK/BKU2/svn/bku/utils/src/main/schema/Core-1.2.xsd\" Structure=\"detached\"><KeyboxIdentifier></KeyboxIdentifier><DataObject><MetaInfo><MimeType></MimeType></MetaInfo><Content><Base64Content></Base64Content></Content></DataObject></CreateCMSSignatureRequest>");
-    Source source = new StreamSource(requestReader);
+    StreamSource source = new StreamSource(requestReader);
     
     factory.createSLCommand(source);
     
@@ -88,7 +87,7 @@ public class SLCommandFactoryTest {
         "<NullOperationRequest xmlns=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2#\">" +
           "missplacedContent" +
         "</NullOperationRequest>");
-    Source source = new StreamSource(requestReader);
+    StreamSource source = new StreamSource(requestReader);
     
     factory.createSLCommand(source);
     
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java b/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java
index 8475a1a9..654dc850 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java
@@ -228,12 +228,11 @@ public class SLUnmarshaller {
     this.jaxbContext = createJAXBContext(packageNames);
   }
 
-  public Object unmarshal(Source source) throws XMLStreamException, JAXBException {
+  public Object unmarshal(StreamSource source) throws XMLStreamException, JAXBException {
     
     ReportingValidationEventHandler validationEventHandler = new ReportingValidationEventHandler();
-        
     XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-    XMLEventReader eventReader = inputFactory.createXMLEventReader(source);
+    XMLEventReader eventReader = inputFactory.createXMLEventReader(source.getReader());
     RedirectEventFilter redirectEventFilter = new RedirectEventFilter();
     XMLEventReader filteredReader = inputFactory.createFilteredReader(eventReader, redirectEventFilter);
 
-- 
cgit v1.2.3