Use newly generated JAXB classes

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1230 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

6 files changed, 13 insertions, 13 deletions

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 518723d8..90e08401 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/SLUnmarshaller.java
@@ -129,7 +129,7 @@ public class SLUnmarshaller {
   private static class DefaultContext {
     
     private static final String[] packageNames = {
-      at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName(),
+      at.buergerkarte.namespaces.securitylayer._1_2_3.ObjectFactory.class.getPackage().getName(),
       org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName(),
       at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName(),
       at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory.class.getPackage().getName(),
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/CreateXMLSignatureResponseType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/CreateXMLSignatureResponseType.java
index 443a98c3..a2a47bf2 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/CreateXMLSignatureResponseType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/CreateXMLSignatureResponseType.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author clemens
  */
-public class CreateXMLSignatureResponseType extends at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureResponseType implements RedirectCallback {
+public class CreateXMLSignatureResponseType extends at.buergerkarte.namespaces.securitylayer._1_2_3.CreateXMLSignatureResponseType implements RedirectCallback {
 
     @XmlTransient
     private final Logger log = LoggerFactory.getLogger(CreateXMLSignatureResponseType.class);
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/SignatureLocationType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/SignatureLocationType.java
index c7505c1c..b2ba81d0 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/SignatureLocationType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/SignatureLocationType.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author clemens
  */
-public class SignatureLocationType extends at.buergerkarte.namespaces.securitylayer._1.SignatureLocationType implements NamespaceContextCallback {
+public class SignatureLocationType extends at.buergerkarte.namespaces.securitylayer._1_2_3.SignatureInfoCreationType.SignatureLocation implements NamespaceContextCallback {
 
     @XmlTransient
     private final Logger log = LoggerFactory.getLogger(SignatureLocationType.class);
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
index c2118ce8..83f3e90a 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author clemens
  */
-public class TransformsInfoType extends at.buergerkarte.namespaces.securitylayer._1.TransformsInfoType implements RedirectCallback {
+public class TransformsInfoType extends at.buergerkarte.namespaces.securitylayer._1_2_3.TransformsInfoType implements RedirectCallback {
 
     @XmlTransient
     private final Logger log = LoggerFactory.getLogger(TransformsInfoType.class);
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
index ed1f8593..cffa31fb 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author clemens
  */
-public class XMLContentType extends at.buergerkarte.namespaces.securitylayer._1.XMLContentType implements RedirectCallback {
+public class XMLContentType extends at.buergerkarte.namespaces.securitylayer._1_2_3.XMLContentType implements RedirectCallback {
 
     @XmlTransient
     private final Logger log = LoggerFactory.getLogger(XMLContentType.class);
diff --git a/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java b/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
index 7d1ed3d2..7d101960 100644
--- a/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
+++ b/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
@@ -28,18 +28,18 @@
  */
 package at.gv.egiz.slbinding;
 
-import at.buergerkarte.namespaces.securitylayer._1.Base64XMLLocRefOptRefContentType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.Base64XMLLocRefOptRefContentType;
 import javax.xml.bind.JAXBException;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
-import at.buergerkarte.namespaces.securitylayer._1.DataObjectAssociationType;
-import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
-import at.buergerkarte.namespaces.securitylayer._1.MetaInfoType;
-import at.buergerkarte.namespaces.securitylayer._1.SignatureInfoCreationType;
-import at.buergerkarte.namespaces.securitylayer._1.TransformsInfoType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.CreateXMLSignatureRequestType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.DataObjectAssociationType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.DataObjectInfoType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.MetaInfoType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.SignatureInfoCreationType;
+import at.buergerkarte.namespaces.securitylayer._1_2_3.TransformsInfoType;
 import at.gv.egiz.slbinding.impl.SignatureLocationType;
 import at.gv.egiz.slbinding.impl.XMLContentType;
 import java.io.BufferedInputStream;
@@ -80,7 +80,7 @@ public class RedirectTest {
     @Test
     public void testRedirect() {
         try {
-            String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();
+            String slPkg = at.buergerkarte.namespaces.securitylayer._1_2_3.ObjectFactory.class.getPackage().getName();
             String dsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
 
             JAXBContext jaxbContext = JAXBContext.newInstance(slPkg + ":" + dsigPkg);