You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/10/16 17:01:28 UTC

cvs commit: ws-fx/wss4j/test/secconv/scenarios build.xml

dims        2004/10/16 08:01:28

  Modified:    wss4j    build.xml
               wss4j/interop build.xml
               wss4j/src/org/apache/ws/axis/security/trust/secconv/interop
                        InteropHandshaker.java
               wss4j/src/org/apache/ws/axis/security/trust/service
                        SecurityTokenService.java
               wss4j/test/secconv/scenarios build.xml
  Log:
  Don't use enum (keyword in JDK1.5)
  
  Revision  Changes    Path
  1.20      +1 -0      ws-fx/wss4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	31 Aug 2004 06:21:52 -0000	1.19
  +++ build.xml	16 Oct 2004 15:01:27 -0000	1.20
  @@ -367,6 +367,7 @@
           <!-- Compile the java code from ${dir.src} into ${build.classes} -->
           <javac srcdir="${dir.samples}"
               debug="on"
  +            source="1.4"
               destdir="${build.classes}">
               <classpath refid="classpath.library"/>
           </javac>
  
  
  
  1.2       +1 -0      ws-fx/wss4j/interop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/interop/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	13 Feb 2004 20:43:04 -0000	1.1
  +++ build.xml	16 Oct 2004 15:01:27 -0000	1.2
  @@ -72,6 +72,7 @@
           </copy>
           <javac srcdir="${dir.work}" 
                   destdir="${dir.classes}"
  +                source="1.4"
                  debug="true">
             <classpath refid="classpath.libraries" />
             <include name="${server}/*.java" />
  
  
  
  1.2       +3 -3      ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/InteropHandshaker.java
  
  Index: InteropHandshaker.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/InteropHandshaker.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropHandshaker.java	16 Oct 2004 08:07:10 -0000	1.1
  +++ InteropHandshaker.java	16 Oct 2004 15:01:27 -0000	1.2
  @@ -243,9 +243,9 @@
   				throw new RuntimeException("Cannot load properties: " + propFilename);
   			}
   			this.options = new Hashtable();
  -			Enumeration enum = properties.keys();
  -			while(enum.hasMoreElements()) {
  -				String key = (String)enum.nextElement();
  +			Enumeration enumKeys = properties.keys();
  +			while(enumKeys.hasMoreElements()) {
  +				String key = (String)enumKeys.nextElement();
   				this.options.put(key,properties.getProperty(key));
   			}
   		}
  
  
  
  1.2       +3 -3      ws-fx/wss4j/src/org/apache/ws/axis/security/trust/service/SecurityTokenService.java
  
  Index: SecurityTokenService.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/service/SecurityTokenService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecurityTokenService.java	16 Oct 2004 08:07:11 -0000	1.1
  +++ SecurityTokenService.java	16 Oct 2004 15:01:27 -0000	1.2
  @@ -98,9 +98,9 @@
               throw new RuntimeException("SecurityTokenSErvice: Cannot load properties: " + propFilename);
           }
           this.options = new Hashtable();
  -        Enumeration enum = properties.keys();
  -        while(enum.hasMoreElements()) {
  -        	String key = (String)enum.nextElement();
  +        Enumeration enumKeys = properties.keys();
  +        while(enumKeys.hasMoreElements()) {
  +        	String key = (String)enumKeys.nextElement();
           	this.options.put(key,properties.getProperty(key));
           }
       }
  
  
  
  1.2       +1 -0      ws-fx/wss4j/test/secconv/scenarios/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/test/secconv/scenarios/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	30 Aug 2004 02:18:22 -0000	1.1
  +++ build.xml	16 Oct 2004 15:01:28 -0000	1.2
  @@ -72,6 +72,7 @@
           </copy>
           <javac srcdir="${dir.work}" 
                   destdir="${dir.classes}"
  +                source="1.4"
                  debug="true">
             <classpath refid="classpath.libraries" />
             <include name="${server}/*.java" />