[jbossws-commits] JBossWS SVN: r4577 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2007-09-18 04:18:50 -0400 (Tue, 18 Sep 2007)
New Revision: 4577

Modified:
   stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
Log:
fixing security issue - static constants must be final + fixing generics warnings

Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java	2007-09-17 14:05:07 UTC (rev 4576)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java	2007-09-18 08:18:50 UTC (rev 4577)
@@ -47,11 +47,11 @@
 public class WSSecurityOMFactory implements ObjectModelFactory
 {
 
-   public static String SERVER_RESOURCE_NAME = "jboss-wsse-server.xml";
+   public static final String SERVER_RESOURCE_NAME = "jboss-wsse-server.xml";
 
-   public static String CLIENT_RESOURCE_NAME = "jboss-wsse-client.xml";
+   public static final String CLIENT_RESOURCE_NAME = "jboss-wsse-client.xml";
 
-   private static HashMap options = new HashMap(6);
+   private static HashMap<String, String> options = new HashMap<String, String>(6);
 
    static
    {
@@ -143,7 +143,7 @@
    public void setValue(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
       log.trace("setValue: [obj=" + configuration + ",value=" + value + "]");
-      String method = (String)options.get(localName);
+      String method = options.get(localName);
       if (method == null)
          return;
 
@@ -170,7 +170,7 @@
       }
       if ("key-passwords".equals(localName))
       {
-         HashMap pwds = new HashMap();
+         HashMap<String, String> pwds = new HashMap<String, String>();
          configuration.setKeyPasswords(pwds);
          return pwds;
       }
@@ -184,7 +184,7 @@
    /**
     * Called when parsing the contents of the <key-password> tag.
     */
-   public Object newChild(HashMap passwords, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   public Object newChild(HashMap<String, String> passwords, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
    {
       log.trace("newChild: " + localName);
       if ("key-password".equals(localName))