You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2013/06/25 11:16:40 UTC
svn commit: r1496389 - in /santuario/xml-security-java/trunk: ./
src/main/java/org/apache/xml/security/stax/config/
src/main/resources/bindings/
Author: coheigea
Date: Tue Jun 25 09:16:40 2013
New Revision: 1496389
URL: http://svn.apache.org/r1496389
Log:
[SANTUARIO-357] - org.xmlsecurity.ns.configuration not exported
- Patch applied, thanks
Added:
santuario/xml-security-java/trunk/src/main/resources/bindings/security-config.xjb
Modified:
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/JCEAlgorithmMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Tue Jun 25 09:16:40 2013
@@ -266,6 +266,10 @@
<schemaIncludes>
<schemaInclude>security-config.xsd</schemaInclude>
</schemaIncludes>
+ <bindingDirectory>${basedir}/src/main/resources/bindings/</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>security-config.xjb</bindingInclude>
+ </bindingIncludes>
<readOnly>true</readOnly>
</configuration>
</execution>
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java Tue Jun 25 09:16:40 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.config;
-import org.xmlsecurity.ns.configuration.PropertiesType;
-import org.xmlsecurity.ns.configuration.PropertyType;
+import org.apache.xml.security.configuration.PropertiesType;
+import org.apache.xml.security.configuration.PropertyType;
import java.util.List;
import java.util.Properties;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java Tue Jun 25 09:16:40 2013
@@ -21,7 +21,8 @@ package org.apache.xml.security.stax.con
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.XMLSecurityConfigurationException;
import org.apache.xml.security.utils.I18n;
-import org.xmlsecurity.ns.configuration.ConfigurationType;
+import org.apache.xml.security.configuration.ConfigurationType;
+import org.apache.xml.security.configuration.ObjectFactory;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
@@ -50,7 +51,7 @@ public class Init {
public static synchronized void init(URI uri) throws XMLSecurityException {
if (initialized == null || (uri != null && !uri.equals(initialized))) {
try {
- JAXBContext jaxbContext = JAXBContext.newInstance("org.xmlsecurity.ns.configuration");
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
final Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
Schema schema = schemaFactory.newSchema(Init.class.getClassLoader().getResource("schemas/security-config.xsd"));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/JCEAlgorithmMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/JCEAlgorithmMapper.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/JCEAlgorithmMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/JCEAlgorithmMapper.java Tue Jun 25 09:16:40 2013
@@ -21,8 +21,8 @@ package org.apache.xml.security.stax.con
import java.util.List;
import org.apache.xml.security.algorithms.JCEMapper;
-import org.xmlsecurity.ns.configuration.AlgorithmType;
-import org.xmlsecurity.ns.configuration.JCEAlgorithmMappingsType;
+import org.apache.xml.security.configuration.AlgorithmType;
+import org.apache.xml.security.configuration.JCEAlgorithmMappingsType;
/**
* Mapping between JCE id and xmlsec uri's for algorithms
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java Tue Jun 25 09:16:40 2013
@@ -22,8 +22,8 @@ import org.apache.xml.security.exception
import org.apache.xml.security.stax.ext.ResourceResolver;
import org.apache.xml.security.stax.ext.ResourceResolverLookup;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
-import org.xmlsecurity.ns.configuration.ResolverType;
-import org.xmlsecurity.ns.configuration.ResourceResolversType;
+import org.apache.xml.security.configuration.ResolverType;
+import org.apache.xml.security.configuration.ResourceResolversType;
import java.util.ArrayList;
import java.util.List;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java Tue Jun 25 09:16:40 2013
@@ -19,8 +19,8 @@
package org.apache.xml.security.stax.config;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
-import org.xmlsecurity.ns.configuration.HandlerType;
-import org.xmlsecurity.ns.configuration.SecurityHeaderHandlersType;
+import org.apache.xml.security.configuration.HandlerType;
+import org.apache.xml.security.configuration.SecurityHeaderHandlersType;
import javax.xml.namespace.QName;
import java.util.HashMap;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java?rev=1496389&r1=1496388&r2=1496389&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java Tue Jun 25 09:16:40 2013
@@ -21,8 +21,8 @@ package org.apache.xml.security.stax.con
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
-import org.xmlsecurity.ns.configuration.TransformAlgorithmType;
-import org.xmlsecurity.ns.configuration.TransformAlgorithmsType;
+import org.apache.xml.security.configuration.TransformAlgorithmType;
+import org.apache.xml.security.configuration.TransformAlgorithmsType;
import java.util.HashMap;
import java.util.List;
Added: santuario/xml-security-java/trunk/src/main/resources/bindings/security-config.xjb
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/security-config.xjb?rev=1496389&view=auto
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/security-config.xjb (added)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/security-config.xjb Tue Jun 25 09:16:40 2013
@@ -0,0 +1,10 @@
+<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ version="2.1">
+ <bindings schemaLocation="../schemas/security-config.xsd" version="1.0">
+ <schemaBindings>
+ <package name="org.apache.xml.security.configuration"/>
+ </schemaBindings>
+ </bindings>
+</bindings>