jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r558145 - in /jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee: AbstractConfig.java JNDIConfig.java
Date Fri, 20 Jul 2007 21:05:56 GMT
Author: jukka
Date: Fri Jul 20 14:05:55 2007
New Revision: 558145

URL: http://svn.apache.org/viewvc?view=rev&rev=558145
Log:
1.3: Merged revision 558142 (JCR-1033)

Modified:
    jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
    jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java

Modified: jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java?view=diff&rev=558145&r1=558144&r2=558145
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
Fri Jul 20 14:05:55 2007
@@ -63,9 +63,9 @@
     }
 
     public void init(ServletConfig ctx) throws ServletException {
-        Enumeration enum = ctx.getInitParameterNames();
-        while (enum.hasMoreElements()) {
-            String name = (String) enum.nextElement();
+        Enumeration names = ctx.getInitParameterNames();
+        while (names.hasMoreElements()) {
+            String name = (String) names.nextElement();
             String mapName = toMapName(name, '-');
             try {
                 if (map.containsKey(mapName)) {

Modified: jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java?view=diff&rev=558145&r1=558144&r2=558145
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java
Fri Jul 20 14:05:55 2007
@@ -91,9 +91,9 @@
     public void init(ServletConfig ctx) throws ServletException  {
         super.init(ctx);
         // add all params whose name starts with 'java.namming.' to the env
-        Enumeration enum = ctx.getInitParameterNames();
-        while (enum.hasMoreElements()) {
-            String name = (String) enum.nextElement();
+        Enumeration names = ctx.getInitParameterNames();
+        while (names.hasMoreElements()) {
+            String name = (String) names.nextElement();
             if (name.startsWith("java.naming.")) {
                 jndiEnv.put(name, ctx.getInitParameter(name));
             }



Mime
View raw message