You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2014/01/14 19:02:37 UTC
svn commit: r1558132 - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/mapping/
uddi-tck/src/test/java/org/apache/juddi/v3/tck/
uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/
Author: kstam
Date: Tue Jan 14 18:02:37 2014
New Revision: 1558132
URL: http://svn.apache.org/r1558132
Log:
JUDDI-716 fixing issue with storing and retrieving X509IssuerSerial signatures
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java
juddi/trunk/uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1558132&r1=1558131&r2=1558132&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Tue Jan 14 18:02:37 2014
@@ -1138,14 +1138,13 @@ public class MappingApiToModel {
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName instanceof String) {
modelKeyInfoValue.setKeyDataValueString((String) x509IssuerSerialOrX509SKIOrX509SubjectName);
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName instanceof X509IssuerSerialType) {
- modelX509KeyData.setKeyDataType(X509IssuerSerialType.class.getSimpleName());
+ modelKeyInfoValue.setKeyDataType(X509IssuerSerialType.class.getSimpleName());
X509IssuerSerialType x509IssuerSerialType = (X509IssuerSerialType) x509IssuerSerialOrX509SKIOrX509SubjectName;
- modelX509KeyData.setKeyDataValueString(x509IssuerSerialType.getX509IssuerName());
- modelX509KeyData.setKeyDataValueBytes(x509IssuerSerialType.getX509SerialNumber().toByteArray());
+ modelKeyInfoValue.setKeyDataValueString(x509IssuerSerialType.getX509IssuerName());
+ modelKeyInfoValue.setKeyDataValueBytes(x509IssuerSerialType.getX509SerialNumber().toByteArray());
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName != null) {
throw new RuntimeException("Unrecognized Value for Element: " + tagName + ": " + x509IssuerSerialOrX509SKIOrX509SubjectName.getClass().getCanonicalName());
}
- modelKeyInfoValue.setKeyDataValue(modelX509KeyData);
modelX509KeyData.getKeyDataValueList().add(modelKeyInfoValue);
}
return modelX509KeyData;
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java?rev=1558132&r1=1558131&r2=1558132&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java Tue Jan 14 18:02:37 2014
@@ -764,7 +764,8 @@ public class UDDI_142_DigitalSignatureIn
}
}
- //JUDDI-716@Test()
+ //JUDDI-716
+ @Test()
public void JUDDI_716_SaveBusinessWithSignatureX509IssuerSerial() throws CertificateException {
SaveBusiness sb = new SaveBusiness();
sb.setAuthInfo(authInfoJoe);
@@ -800,7 +801,8 @@ public class UDDI_142_DigitalSignatureIn
}
}
- //JUDDI-716 @Test()
+ //JUDDI-716
+ @Test()
public void JUDDI_716_SaveBusinessAllOptions() throws CertificateException {
SaveBusiness sb = new SaveBusiness();
sb.setAuthInfo(authInfoJoe);
Modified: juddi/trunk/uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java?rev=1558132&r1=1558131&r2=1558132&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java Tue Jan 14 18:02:37 2014
@@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import org.w3c.dom.Element;
@@ -61,7 +60,6 @@ import org.w3c.dom.Element;
@XmlType(name = "X509DataType", propOrder = {
"x509IssuerSerialOrX509SKIOrX509SubjectName"
})
-@XmlSeeAlso({X509IssuerSerialType.class})
public class X509DataType {
@XmlElementRefs({
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org