You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/04/16 18:49:09 UTC
svn commit: r1587974 - in /webservices/wss4j/trunk/ws-security-stax/src: main/java/org/apache/wss4j/stax/WSSec.java test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java

Author: coheigea
Date: Wed Apr 16 16:49:08 2014
New Revision: 1587974

URL: http://svn.apache.org/r1587974
Log:
Load schemas by default again

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1587974&r1=1587973&r2=1587974&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java Wed Apr 16 16:49:08 2014
@@ -37,7 +37,6 @@ import org.apache.wss4j.stax.ext.WSSSecu
 import org.apache.wss4j.stax.ext.WSSUtils;
 import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.ConfigurationProperties;
 import org.apache.xml.security.stax.config.Init;
 import org.apache.xml.security.stax.ext.SecurePart;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
@@ -72,11 +71,9 @@ public class WSSec {
                             org.apache.xml.security.binding.excc14n.ObjectFactory.class
                     )
             );
-            String loadSchemas = ConfigurationProperties.getProperty("LoadSchemas");
-            if (Boolean.parseBoolean(loadSchemas)) {
-                Schema schema = WSSUtils.loadWSSecuritySchemas();
-                WSSConstants.setJaxbSchemas(schema);
-            }
+            
+            Schema schema = WSSUtils.loadWSSecuritySchemas();
+            WSSConstants.setJaxbSchemas(schema);
         } catch (XMLSecurityException e) {
             throw new RuntimeException(e.getMessage(), e);
         } catch (JAXBException e) {

Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java?rev=1587974&r1=1587973&r2=1587974&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java Wed Apr 16 16:49:08 2014
@@ -41,7 +41,6 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.validation.Schema;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpression;
 
@@ -1262,8 +1261,6 @@ public class InteroperabilityTest extend
                 securityProperties.addIgnoreBSPRule(bspRules.next());
             }
 
-            Schema schema = WSSUtils.loadWSSecuritySchemas();
-            WSSConstants.setJaxbSchemas(schema);
             try {
                 Document document = doInboundSecurity(securityProperties,
                         xmlInputFactory.createXMLStreamReader(