You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/12/07 10:49:11 UTC
svn commit: r483397 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/resources/META-INF/org.apache.openejb/
itests/openejb-itests-beans/src/main/java/org/...
Author: dblevins
Date: Thu Dec 7 01:49:10 2006
New Revision: 483397
URL: http://svn.apache.org/viewvc?view=rev&rev=483397
Log:
Added code to test character as an env-entry-type
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Thu Dec 7 01:49:10 2006
@@ -168,6 +168,9 @@
obj = new Boolean(entry.value);
} else if (type == Byte.class) {
obj = new Byte(entry.value);
+ } else if (type == Character.class) {
+ StringBuilder sb = new StringBuilder(entry.value + " ");
+ obj = new Character(sb.charAt(0));
} else {
throw new IllegalArgumentException("Invalid env-ref-type " + type);
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Thu Dec 7 01:49:10 2006
@@ -230,6 +230,7 @@
<o:envEntry jndiName="entity/cmp/references/Integer" type="java.lang.Integer" value="1"/>
<o:envEntry jndiName="entity/cmp/references/Short" type="java.lang.Short" value="1"/>
<o:envEntry jndiName="entity/cmp/references/Byte" type="java.lang.Byte" value="1"/>
+ <o:envEntry jndiName="entity/cmp/references/Character" type="java.lang.Character" value="D"/>
<o:ejbRef jndiName="entity/cmp/beanReferences/cmp_entity" local="false"
ejbId="client/tests/entity/cmp/BasicCmpHome"/>
<o:ejbRef jndiName="entity/cmp/beanReferences/stateful" local="false"
@@ -313,6 +314,7 @@
<o:envEntry jndiName="entity/bmp/references/Integer" type="java.lang.Integer" value="1"/>
<o:envEntry jndiName="entity/bmp/references/Short" type="java.lang.Short" value="1"/>
<o:envEntry jndiName="entity/bmp/references/Byte" type="java.lang.Byte" value="1"/>
+ <o:envEntry jndiName="entity/bmp/references/Character" type="java.lang.Character" value="D"/>
<o:ejbRef jndiName="entity/bmp/beanReferences/bmp_entity" local="false"
ejbId="client/tests/entity/bmp/BasicBmpHome"/>
<o:ejbRef jndiName="entity/bmp/beanReferences/stateful" local="false"
@@ -397,6 +399,7 @@
<o:envEntry jndiName="stateful/references/Integer" type="java.lang.Integer" value="1"/>
<o:envEntry jndiName="stateful/references/Short" type="java.lang.Short" value="1"/>
<o:envEntry jndiName="stateful/references/Byte" type="java.lang.Byte" value="1"/>
+ <o:envEntry jndiName="stateful/references/Character" type="java.lang.Character" value="D"/>
<o:ejbRef jndiName="stateful/beanReferences/bmp_entity" local="false"
ejbId="client/tests/entity/bmp/BasicBmpHome"/>
<o:ejbRef jndiName="stateful/beanReferences/stateful" local="false"
@@ -501,6 +504,7 @@
<o:envEntry jndiName="stateless/references/Integer" type="java.lang.Integer" value="1"/>
<o:envEntry jndiName="stateless/references/Short" type="java.lang.Short" value="1"/>
<o:envEntry jndiName="stateless/references/Byte" type="java.lang.Byte" value="1"/>
+ <o:envEntry jndiName="stateless/references/Character" type="java.lang.Character" value="D"/>
<o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
ejbId="client/tests/stateful/BasicStatefulHome"/>
<o:ejbRef jndiName="stateless/beanReferences/bmp_entity" local="false"
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java Thu Dec 7 01:49:10 2006
@@ -322,6 +322,26 @@
}
}
+
+ public void lookupCharacterEntry() throws TestFailureException{
+ try{
+ try{
+ InitialContext ctx = new InitialContext();
+ Assert.assertNotNull("The InitialContext is null", ctx );
+
+ Character expected = new Character('D');
+ Character actual = (Character)ctx.lookup("java:comp/env/entity/bmp/references/Character");
+
+ Assert.assertNotNull("The Character looked up is null", actual );
+ Assert.assertEquals(expected, actual );
+
+ } catch (Exception e){
+ Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ } catch (AssertionFailedError afe){
+ throw new TestFailureException(afe);
+ }
+ }
public void lookupResource() throws TestFailureException{
try{
try{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java Thu Dec 7 01:49:10 2006
@@ -41,5 +41,6 @@
public void lookupShortEntry() throws TestFailureException, RemoteException;
public void lookupBooleanEntry() throws TestFailureException, RemoteException;
public void lookupByteEntry() throws TestFailureException, RemoteException;
+ public void lookupCharacterEntry() throws TestFailureException, RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java Thu Dec 7 01:49:10 2006
@@ -301,6 +301,26 @@
}
}
+ public void lookupCharacterEntry() throws TestFailureException{
+ try{
+ try{
+ InitialContext ctx = new InitialContext();
+ Assert.assertNotNull("The InitialContext is null", ctx );
+
+ Character expected = new Character('D');
+ Character actual = (Character)ctx.lookup("java:comp/env/entity/cmp/references/Character");
+
+ Assert.assertNotNull("The Character looked up is null", actual );
+ Assert.assertEquals(expected, actual );
+
+ } catch (Exception e){
+ Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ } catch (AssertionFailedError afe){
+ throw new TestFailureException(afe);
+ }
+ }
+
public void lookupResource() throws TestFailureException{
try{
try{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java Thu Dec 7 01:49:10 2006
@@ -41,5 +41,6 @@
public void lookupShortEntry() throws TestFailureException, RemoteException;
public void lookupBooleanEntry() throws TestFailureException, RemoteException;
public void lookupByteEntry() throws TestFailureException, RemoteException;
+ public void lookupCharacterEntry() throws TestFailureException, RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java Thu Dec 7 01:49:10 2006
@@ -285,6 +285,26 @@
}
}
+ public void lookupCharacterEntry() throws TestFailureException{
+ try{
+ try{
+ InitialContext ctx = new InitialContext();
+ Assert.assertNotNull("The InitialContext is null", ctx );
+
+ Character expected = new Character('D');
+ Character actual = (Character)ctx.lookup("java:comp/env/stateful/references/Character");
+
+ Assert.assertNotNull("The Character looked up is null", actual );
+ Assert.assertEquals(expected, actual );
+
+ } catch (Exception e){
+ Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ } catch (AssertionFailedError afe){
+ throw new TestFailureException(afe);
+ }
+ }
+
public void lookupResource() throws TestFailureException{
try{
try{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java Thu Dec 7 01:49:10 2006
@@ -41,5 +41,6 @@
public void lookupShortEntry() throws TestFailureException, RemoteException;
public void lookupBooleanEntry() throws TestFailureException, RemoteException;
public void lookupByteEntry() throws TestFailureException, RemoteException;
+ public void lookupCharacterEntry() throws TestFailureException, RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java Thu Dec 7 01:49:10 2006
@@ -271,6 +271,26 @@
}
}
+ public void lookupCharacterEntry() throws TestFailureException{
+ try{
+ try{
+ InitialContext ctx = new InitialContext();
+ Assert.assertNotNull("The InitialContext is null", ctx );
+
+ Character expected = new Character('D');
+ Character actual = (Character)ctx.lookup("java:comp/env/stateless/references/Character");
+
+ Assert.assertNotNull("The Character looked up is null", actual );
+ Assert.assertEquals(expected, actual );
+
+ } catch (Exception e){
+ Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ } catch (AssertionFailedError afe){
+ throw new TestFailureException(afe);
+ }
+ }
+
public void lookupResource() throws TestFailureException{
try{
try{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java Thu Dec 7 01:49:10 2006
@@ -41,5 +41,6 @@
public void lookupShortEntry() throws TestFailureException, RemoteException;
public void lookupBooleanEntry() throws TestFailureException, RemoteException;
public void lookupByteEntry() throws TestFailureException, RemoteException;
+ public void lookupCharacterEntry() throws TestFailureException, RemoteException;
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Thu Dec 7 01:49:10 2006
@@ -151,7 +151,12 @@
<env-entry-type>java.lang.Byte</env-entry-type>
<env-entry-value>1</env-entry-value>
</env-entry>
- <ejb-ref>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>D</env-entry-value>
+ </env-entry>
+ <ejb-ref>
<ejb-ref-name>entity/cmp/beanReferences/cmp_entity</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>org.apache.openejb.test.entity.cmp.BasicCmpHome</home>
@@ -377,7 +382,12 @@
<env-entry-type>java.lang.Byte</env-entry-type>
<env-entry-value>1</env-entry-value>
</env-entry>
- <ejb-ref>
+ <env-entry>
+ <env-entry-name>stateful/references/Character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>D</env-entry-value>
+ </env-entry>
+ <ejb-ref>
<ejb-ref-name>stateful/beanReferences/bmp_entity</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>org.apache.openejb.test.entity.bmp.BasicBmpHome</home>
@@ -713,7 +723,12 @@
<env-entry-type>java.lang.Byte</env-entry-type>
<env-entry-value>1</env-entry-value>
</env-entry>
- <ejb-ref>
+ <env-entry>
+ <env-entry-name>stateless/references/Character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>D</env-entry-value>
+ </env-entry>
+ <ejb-ref>
<ejb-ref-name>stateless/beanReferences/Enterprise_bean_access</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<home>org.apache.openejb.test.stateful.BasicStatefulHome</home>
@@ -927,7 +942,12 @@
<env-entry-type>java.lang.Byte</env-entry-type>
<env-entry-value>1</env-entry-value>
</env-entry>
- <ejb-ref>
+ <env-entry>
+ <env-entry-name>entity/bmp/references/Character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>D</env-entry-value>
+ </env-entry>
+ <ejb-ref>
<ejb-ref-name>entity/bmp/beanReferences/bmp_entity</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>org.apache.openejb.test.entity.bmp.BasicBmpHome</home>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java Thu Dec 7 01:49:10 2006
@@ -130,7 +130,17 @@
}
}
- public void test09_lookupEntityBean() {
+ public void test09_lookupCharacterEntry() {
+ try{
+ ejbObject.lookupCharacterEntry();
+ } catch (TestFailureException e){
+ throw e.error;
+ } catch (Exception e){
+ fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ }
+
+ public void test10_lookupEntityBean() {
try{
ejbObject.lookupEntityBean();
} catch (TestFailureException e){
@@ -139,8 +149,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test10_lookupStatefulBean() {
+
+ public void test11_lookupStatefulBean() {
try{
ejbObject.lookupStatefulBean();
} catch (TestFailureException e){
@@ -149,8 +159,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test11_lookupStatelessBean() {
+
+ public void test12_lookupStatelessBean() {
try{
ejbObject.lookupStatelessBean();
} catch (TestFailureException e){
@@ -159,8 +169,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test12_lookupResource() {
+
+ public void test13_lookupResource() {
try{
ejbObject.lookupResource();
} catch (TestFailureException e){
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java Thu Dec 7 01:49:10 2006
@@ -130,7 +130,17 @@
}
}
- public void test09_lookupEntityBean() {
+ public void test09_lookupCharacterEntry() {
+ try{
+ ejbObject.lookupCharacterEntry();
+ } catch (TestFailureException e){
+ throw e.error;
+ } catch (Exception e){
+ fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ }
+
+ public void test10_lookupEntityBean() {
try{
ejbObject.lookupEntityBean();
} catch (TestFailureException e){
@@ -139,8 +149,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test10_lookupStatefulBean() {
+
+ public void test11_lookupStatefulBean() {
try{
ejbObject.lookupStatefulBean();
} catch (TestFailureException e){
@@ -149,8 +159,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test11_lookupStatelessBean() {
+
+ public void test12_lookupStatelessBean() {
try{
ejbObject.lookupStatelessBean();
} catch (TestFailureException e){
@@ -159,8 +169,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test12_lookupResource() {
+
+ public void test13_lookupResource() {
try{
ejbObject.lookupResource();
} catch (TestFailureException e){
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java Thu Dec 7 01:49:10 2006
@@ -139,7 +139,17 @@
}
}
- public void test09_lookupEntityBean() {
+ public void test09_lookupCharacterEntry() {
+ try{
+ ejbObject.lookupCharacterEntry();
+ } catch (TestFailureException e){
+ throw e.error;
+ } catch (Exception e){
+ fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ }
+
+ public void test10_lookupEntityBean() {
try{
ejbObject.lookupEntityBean();
} catch (TestFailureException e){
@@ -148,8 +158,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test10_lookupStatefulBean() {
+
+ public void test11_lookupStatefulBean() {
try{
ejbObject.lookupStatefulBean();
} catch (TestFailureException e){
@@ -158,8 +168,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test11_lookupStatelessBean() {
+
+ public void test12_lookupStatelessBean() {
try{
ejbObject.lookupStatelessBean();
} catch (TestFailureException e){
@@ -168,8 +178,8 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
- public void test12_lookupResource() {
+
+ public void test13_lookupResource() {
try{
ejbObject.lookupResource();
} catch (TestFailureException e){
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java?view=diff&rev=483397&r1=483396&r2=483397
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java Thu Dec 7 01:49:10 2006
@@ -139,7 +139,17 @@
}
}
- public void test09_lookupEntityBean() {
+ public void test09_lookupCharacterEntry() {
+ try{
+ ejbObject.lookupCharacterEntry();
+ } catch (TestFailureException e){
+ throw e.error;
+ } catch (Exception e){
+ fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ }
+ }
+
+ public void test10_lookupEntityBean() {
try{
ejbObject.lookupEntityBean();
} catch (TestFailureException e){
@@ -149,7 +159,7 @@
}
}
- public void test10_lookupStatefulBean() {
+ public void test11_lookupStatefulBean() {
try{
ejbObject.lookupStatefulBean();
} catch (TestFailureException e){
@@ -159,7 +169,7 @@
}
}
- public void test11_lookupStatelessBean() {
+ public void test12_lookupStatelessBean() {
try{
ejbObject.lookupStatelessBean();
} catch (TestFailureException e){
@@ -169,7 +179,7 @@
}
}
- public void test12_lookupResource() {
+ public void test13_lookupResource() {
try{
ejbObject.lookupResource();
} catch (TestFailureException e){
@@ -178,5 +188,4 @@
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
-
}