Author: coheigea
Date: Thu Mar 27 15:25:40 2014
New Revision: 1582352
URL: http://svn.apache.org/r1582352
Log:
Fixing some bugs that emerged from OSGi testing
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSS4JResourceBundle.java
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSS4JResourceBundle.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSS4JResourceBundle.java?rev=1582352&r1=1582351&r2=1582352&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSS4JResourceBundle.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSS4JResourceBundle.java
Thu Mar 27 15:25:40 2014
@@ -25,6 +25,7 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.I18n;
/**
* ResourceBundle for WSS4J
@@ -43,14 +44,16 @@ public class WSS4JResourceBundle extends
ResourceBundle tmpResourceBundle;
try {
tmpResourceBundle =
-
ResourceBundle.getBundle(Constants.exceptionMessagesResourceBundleBase);
+
ResourceBundle.getBundle(Constants.exceptionMessagesResourceBundleBase,
+ Locale.getDefault(),
+ I18n.class.getClassLoader());
} catch (MissingResourceException ex) {
// Using a Locale of which there is no properties file.
LOG.debug(ex.getMessage());
// Default to en/US
tmpResourceBundle =
ResourceBundle.getBundle(Constants.exceptionMessagesResourceBundleBase,
- new Locale("en", "US"));
+ new Locale("en", "US"),
I18n.class.getClassLoader());
}
xmlSecResourceBundle = tmpResourceBundle;
}
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1582352&r1=1582351&r2=1582352&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Thu Mar 27 15:25:40 2014
@@ -34,18 +34,6 @@
<wss4j.osgi.dynamic.import>
org.bouncycastle.jce.provider
</wss4j.osgi.dynamic.import>
- <!-- Import-Package>
- !org.apache.wss4j.dom.*,
- javax.xml.crypto.*,
- org.slf4j.*;version="[1.7,2)",
- org.apache.xml.security.*;version="[2.0.0,3]",
- org.apache.wss4j.common.*;version="[2.0,3)",
- org.bouncycastle.*;resolution:=optional,
- org.apache.jcp.xml.dsig.internal.*,
-
org.opensaml.*;resolution:=optional;version="[2.5.0,3)",
- *;resolution:=optional
- </Import-Package-->
-
</properties>
<build>
Modified: webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/pom.xml?rev=1582352&r1=1582351&r2=1582352&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/pom.xml Thu Mar 27 15:25:40
2014
@@ -48,6 +48,7 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
