Diff
Modified: trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigUtils.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigUtils.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigUtils.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -303,12 +303,12 @@
}
public static boolean addDeploymentEntryToConfig(String jarLocation, Openejb config) {
- Enumeration enum = config.enumerateDeployments();
+ Enumeration enumeration = config.enumerateDeployments();
File jar = new File(jarLocation);
/* Check to see if the entry is already listed */
- while (enum.hasMoreElements()) {
- Deployments d = (Deployments) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ Deployments d = (Deployments) enumeration.nextElement();
if (d.getJar() != null) {
try {
Modified: trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -578,10 +578,10 @@
private Map getDeployments(OpenejbJar j) throws OpenEJBException {
HashMap map = new HashMap(j.getEjbDeploymentCount());
- Enumeration enum = j.enumerateEjbDeployment();
+ Enumeration enumeration = j.enumerateEjbDeployment();
- while (enum.hasMoreElements()) {
- EjbDeployment d = (EjbDeployment) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ EjbDeployment d = (EjbDeployment) enumeration.nextElement();
map.put(d.getEjbName(), d);
}
Modified: trunk/openejb1/modules/core/src/java/org/openejb/core/entity/EntityEjbHomeHandler.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/core/entity/EntityEjbHomeHandler.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/core/entity/EntityEjbHomeHandler.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -117,17 +117,17 @@
}
return proxies;
}else if ( retValue instanceof org.openejb.util.ArrayEnumeration ) {
- org.openejb.util.ArrayEnumeration enum = (org.openejb.util.ArrayEnumeration) retValue;
- for ( int i = enum.size()-1; i >=0 ; --i ) {
- enum.set( i, createProxy((ProxyInfo)enum.get(i)) );
+ org.openejb.util.ArrayEnumeration enumeration = (org.openejb.util.ArrayEnumeration) retValue;
+ for ( int i = enumeration.size()-1; i >=0 ; --i ) {
+ enumeration.set( i, createProxy((ProxyInfo)enumeration.get(i)) );
}
- return enum;
+ return enumeration;
}else if ( retValue instanceof java.util.Enumeration ) {
- java.util.Enumeration enum = (java.util.Enumeration) retValue;
+ java.util.Enumeration enumeration = (java.util.Enumeration) retValue;
// Don't use Vector, because it contains unnecessary synchronization
java.util.List proxies = new java.util.ArrayList();
- while ( enum.hasMoreElements() ) {
- proxies.add( createProxy((ProxyInfo)enum.nextElement()) );
+ while ( enumeration.hasMoreElements() ) {
+ proxies.add( createProxy((ProxyInfo)enumeration.nextElement()) );
}
return new org.openejb.util.ArrayEnumeration(proxies);
} else {
Modified: trunk/openejb1/modules/core/src/java/org/openejb/core/ivm/naming/IvmContext.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/core/ivm/naming/IvmContext.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/core/ivm/naming/IvmContext.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -275,7 +275,7 @@
if(obj.getClass() == IvmContext.class)
return new MyListEnumeration(((IvmContext)obj).mynode);
else {
- return null; // should be simple enum of one element
+ return null; // should be simple enumeration of one element
}
}
public NamingEnumeration list(Name name)
@@ -288,7 +288,7 @@
if(obj.getClass() == IvmContext.class)
return new MyListEnumeration(((IvmContext)obj).mynode);
else {
- return null; // should be simple enum of one element
+ return null; // should be simple enumeration of one element
}
}
public NamingEnumeration listBindings(Name name)
Modified: trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/RAFPassivater.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/RAFPassivater.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/RAFPassivater.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -82,10 +82,10 @@
fileID++;
RandomAccessFile ras = new RandomAccessFile(System.getProperty("java.io.tmpdir", File.separator + "tmp") + File.separator + "passivation"+fileID+".ser","rw");
- Enumeration enum = stateTable.keys();
+ Enumeration enumeration = stateTable.keys();
Pointer lastPointer = null;
- while(enum.hasMoreElements()){
- Object id = enum.nextElement();
+ while(enumeration.hasMoreElements()){
+ Object id = enumeration.nextElement();
Object obj = stateTable.get(id);
byte [] bytes = Serializer.serialize(obj);
long filepointer = ras.getFilePointer();
Modified: trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -113,9 +113,9 @@
}
public void passivate(Hashtable hash)throws org.openejb.SystemException{
- Enumeration enum = hash.keys();
- while(enum.hasMoreElements()){
- Object id = enum.nextElement();
+ Enumeration enumeration = hash.keys();
+ while(enumeration.hasMoreElements()){
+ Object id = enumeration.nextElement();
passivate(id, hash.get(id));
}
}
Modified: trunk/openejb1/modules/core/src/java/org/openejb/loader/LoaderServlet.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/loader/LoaderServlet.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/loader/LoaderServlet.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -121,10 +121,10 @@
p.setProperty("openejb.loader","tomcat");
// Load in each init-param as a property
- Enumeration enum = config.getInitParameterNames();
+ Enumeration enumeration = config.getInitParameterNames();
System.out.println("OpenEJB init-params:");
- while (enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ String name = (String) enumeration.nextElement();
String value = config.getInitParameter(name);
p.put(name, value);
System.out.println("\tparam-name: " + name + ", param-value: " + value);
Modified: trunk/openejb1/modules/core/src/java/org/openejb/ri/sp/PseudoTransactionService.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/ri/sp/PseudoTransactionService.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/ri/sp/PseudoTransactionService.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -163,10 +163,10 @@
// the transaciton must be NOT be rolleback for this method to execute.
private void doBeforeCompletion(){
- Enumeration enum = registeredSynchronizations.elements();
- while(enum.hasMoreElements()){
+ Enumeration enumeration = registeredSynchronizations.elements();
+ while(enumeration.hasMoreElements()){
try{
- Synchronization sync = (Synchronization)enum.nextElement();
+ Synchronization sync = (Synchronization)enumeration.nextElement();
sync.beforeCompletion();
}catch(RuntimeException re){
re.printStackTrace();
@@ -174,10 +174,10 @@
}
}
private void doAfterCompletion(int status){
- Enumeration enum = registeredSynchronizations.elements();
- while(enum.hasMoreElements()){
+ Enumeration enumeration = registeredSynchronizations.elements();
+ while(enumeration.hasMoreElements()){
try{
- Synchronization sync = (Synchronization)enum.nextElement();
+ Synchronization sync = (Synchronization)enumeration.nextElement();
sync.afterCompletion(status);
}catch(RuntimeException re){
re.printStackTrace();
Modified: trunk/openejb1/modules/core/src/java/org/openejb/server/telnet/Lookup.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/server/telnet/Lookup.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/server/telnet/Lookup.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -127,11 +127,11 @@
{
try
{
- NamingEnumeration enum = null;
+ NamingEnumeration enumeration = null;
try
{
- enum = ctx.list( name );
+ enumeration = ctx.list( name );
}
catch ( NameNotFoundException e )
{
@@ -147,15 +147,15 @@
return;
}
- if ( enum == null )
+ if ( enumeration == null )
{
return;
}
- while ( enum.hasMore() )
+ while ( enumeration.hasMore() )
{
- NameClassPair entry = ( NameClassPair ) enum.next();
+ NameClassPair entry = ( NameClassPair ) enumeration.next();
String eName = entry.getName();
Class eClass = null;
Modified: trunk/openejb1/modules/core/src/java/org/openejb/tomcat/TomcatLoader.java (2486 => 2487)
--- trunk/openejb1/modules/core/src/java/org/openejb/tomcat/TomcatLoader.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/core/src/java/org/openejb/tomcat/TomcatLoader.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -52,10 +52,10 @@
Properties p = new Properties();
p.setProperty("openejb.loader", "tomcat");
- Enumeration enum = config.getInitParameterNames();
+ Enumeration enumeration = config.getInitParameterNames();
System.out.println("OpenEJB init-params:");
- while (enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ String name = (String) enumeration.nextElement();
String value = config.getInitParameter(name);
p.put(name, value);
System.out.println("\tparam-name: " + name + ", param-value: " + value);
Modified: trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/WebAdminBean.java (2486 => 2487)
--- trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/WebAdminBean.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/WebAdminBean.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -357,15 +357,15 @@
try{
Context ctx = org.openejb.OpenEJB.getJNDIContext();
ctx = (Context) ctx.lookup("openejb/ejb");
- NamingEnumeration enum = ctx.list("");
- //System.out.println("\n\nENUM "+enum);
-
- if ( enum == null){
+ NamingEnumeration enumeration = ctx.list("");
+ //System.out.println("\n\nENUM "+enumeration);
+
+ if ( enumeration == null){
return sections;
}
- while (enum.hasMore()) {
- NameClassPair entry = (NameClassPair)enum.next();
+ while (enumeration.hasMore()) {
+ NameClassPair entry = (NameClassPair)enumeration.next();
//System.out.println("ITEM NAME "+entry.getName());
//System.out.println("ITEM CLASS "+entry.getClassName());
if ( !entry.getClassName().equals("org.openejb.core.ivm.naming.IvmContext") ) {
@@ -387,14 +387,14 @@
private String[] getSubsections(Context ctx){
ArrayList sections = new ArrayList();
try{
- NamingEnumeration enum = ctx.list("");
+ NamingEnumeration enumeration = ctx.list("");
- if ( enum == null){
+ if ( enumeration == null){
return new String[0];
}
- while (enum.hasMore()) {
- NameClassPair entry = (NameClassPair)enum.next();
+ while (enumeration.hasMore()) {
+ NameClassPair entry = (NameClassPair)enumeration.next();
//System.out.println("ITEM NAME "+entry.getName());
//System.out.println("ITEM CLASS "+entry.getClassName());
if ( !entry.getClassName().equals("org.openejb.core.stateless.EncReference") ) {
@@ -476,30 +476,22 @@
/** called on a stateful sessionbean after the bean is
* deserialized from storage and put back into use.
- * @throws EJBException if an exeption is thrown
- * @throws RemoteException if an exception is thrown
- */
+ */
public void ejbActivate() {}
/** called on a stateful sessionbean before the bean is
* removed from memory and serialized to a temporary store.
* This method is never called on a stateless sessionbean
- * @throws EJBException if an exception is thrown
- * @throws RemoteException if an exception is thrown
- */
+ */
public void ejbPassivate() {}
/** called when the bean is about to be garbage collected
- * @throws EJBException if an exception is thrown
- * @throws RemoteException if an exception is thrown
- */
+ */
public void ejbRemove() {}
/** sets the session context
* @param sessionContext the session context
- * @throws EJBException if an exception is thrown
- * @throws RemoteException if an exception is thrown
- */
+ */
public void setSessionContext(SessionContext sessionContext) {
ejbContext = sessionContext;
if (sections == null) {
Modified: trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/clienttools/ViewJndiBean.java (2486 => 2487)
--- trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/clienttools/ViewJndiBean.java 2006-02-22 21:28:00 UTC (rev 2486)
+++ trunk/openejb1/modules/webadmin/src/java/org/openejb/webadmin/clienttools/ViewJndiBean.java 2006-02-22 22:05:03 UTC (rev 2487)
@@ -178,9 +178,9 @@
public void buildNode(Node parent, Context ctx) throws Exception{
if (false) throw new NullPointerException();
- NamingEnumeration enum = ctx.list( "" );
- while (enum.hasMoreElements()){
- NameClassPair pair = (NameClassPair)enum.next();
+ NamingEnumeration enumeration = ctx.list( "" );
+ while (enumeration.hasMoreElements()){
+ NameClassPair pair = (NameClassPair)enumeration.next();
Node node = new Node();
parent.addChild(node);
node.name = pair.getName();
