Diff
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -243,12 +243,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/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -454,10 +454,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/openejb3/container/openejb-core/src/main/java/org/openejb/core/CoreContext.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/CoreContext.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/CoreContext.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -172,6 +172,11 @@
throw new java.lang.IllegalStateException("container-managed transaction beans can not access the UserTransaction");
}
+ public Object lookup(String name){
+ throw new UnsupportedOperationException("lookup");
+ }
+
+
/*----------------------------------------------------*/
/* UNSUPPORTED DEPRICATED METHODS */
/*----------------------------------------------------*/
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/entity/EntityEjbHomeHandler.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/entity/EntityEjbHomeHandler.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/entity/EntityEjbHomeHandler.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -43,17 +43,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;
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/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/RAFPassivater.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/RAFPassivater.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/RAFPassivater.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -36,10 +36,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/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -70,9 +70,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/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/StatefulContext.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/StatefulContext.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/StatefulContext.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -98,7 +98,14 @@
}
public MessageContext getMessageContext() {
- return null;
+ throw new UnsupportedOperationException("not implemented");
}
+ public Object getBusinessObject(Class businessInterface) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ public Class getInvokedBusinessInterface() {
+ throw new UnsupportedOperationException("not implemented");
+ }
}
\ No newline at end of file
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateless/StatelessContext.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateless/StatelessContext.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateless/StatelessContext.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -91,7 +91,14 @@
}
public MessageContext getMessageContext() {
- return null;
+ throw new UnsupportedOperationException("not implemented");
}
+ public Object getBusinessObject(Class businessInterface) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ public Class getInvokedBusinessInterface() {
+ throw new UnsupportedOperationException("not implemented");
+ }
}
\ No newline at end of file
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/LoaderServlet.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/LoaderServlet.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/LoaderServlet.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -21,10 +21,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/openejb3/container/openejb-core/src/main/java/org/openejb/ri/sp/PseudoTransactionService.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/ri/sp/PseudoTransactionService.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/ri/sp/PseudoTransactionService.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -154,10 +154,10 @@
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();
@@ -166,10 +166,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/openejb3/container/openejb-core/src/main/java/org/openejb/server/telnet/Lookup.java (2429 => 2430)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/server/telnet/Lookup.java 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/server/telnet/Lookup.java 2006-02-09 05:52:41 UTC (rev 2430)
@@ -71,10 +71,10 @@
public void list(String name, DataInputStream in, PrintStream out) throws IOException {
try {
- NamingEnumeration enum = null;
+ NamingEnumeration enumeration = null;
try {
- enum = ctx.list(name);
+ enumeration = ctx.list(name);
}
catch (NameNotFoundException e) {
out.print("lookup: ");
@@ -88,13 +88,13 @@
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/openejb3/pom.xml (2429 => 2430)
--- trunk/openejb3/pom.xml 2006-02-08 02:59:57 UTC (rev 2429)
+++ trunk/openejb3/pom.xml 2006-02-09 05:52:41 UTC (rev 2430)
@@ -32,8 +32,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
@@ -41,8 +41,9 @@
<modules>
<module>openejb-itests</module>
<module>container</module>
- <module>server</module>
+ <module>server</module>
<module>openejb-assembly</module>
+<!-- <module>jee5_exp_specs</module>-->
</modules>
<repositories>
<repository>
@@ -67,8 +68,18 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>castor</groupId>
