[jboss-cvs] JBossAS SVN: r58923 - in trunk/ejb3/src: main/org/jboss/ejb3/metamodel resources/test/appclient test/org/jboss/ejb3/test/appclient/client test/org/jboss/ejb3/test/appclient/unit

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2006-12-08 05:28:33 -0500 (Fri, 08 Dec 2006)
New Revision: 58923

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
   trunk/ejb3/src/resources/test/appclient/application-client.xml
   trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java
Log:
EJBTHREE-803: application-client id

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2006-12-08 09:22:17 UTC (rev 58922)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2006-12-08 10:28:33 UTC (rev 58923)
@@ -133,6 +133,10 @@
             {
                // ignore
             }
+            else if(attrs.getLocalName(i).equals("id"))
+            {
+               // ignore
+            }
             else
                throw new IllegalArgumentException(attrs.getLocalName(i));
          }

Modified: trunk/ejb3/src/resources/test/appclient/application-client.xml
===================================================================
--- trunk/ejb3/src/resources/test/appclient/application-client.xml	2006-12-08 09:22:17 UTC (rev 58922)
+++ trunk/ejb3/src/resources/test/appclient/application-client.xml	2006-12-08 10:28:33 UTC (rev 58923)
@@ -3,7 +3,7 @@
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
                     http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-                    version="5">
+                    version="5" id="appclient-test">
 	<display-name>appclient-test-client</display-name>
 	<description>application client unit test</description>
 

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	2006-12-08 09:22:17 UTC (rev 58922)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	2006-12-08 10:28:33 UTC (rev 58923)
@@ -56,6 +56,13 @@
    @Resource(name="messageReplier")
    private static Destination destination;
    
+   private static int postConstructCalls = 0;
+   
+   public static int getPostConstructCalls()
+   {
+      return postConstructCalls;
+   }
+   
    public static String getResult()
    {
       return result;
@@ -114,4 +121,9 @@
          throw new RuntimeException(e);
       }
    }
+   
+   public static void postConstruct()
+   {
+      postConstructCalls++;
+   }
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	2006-12-08 09:22:17 UTC (rev 58922)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	2006-12-08 10:28:33 UTC (rev 58923)
@@ -57,9 +57,17 @@
       
       ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
       
-      String actual = HelloWorldClient.getResult();
-      String expected = "Hi " + name + ", how are you?";
-      assertEquals(expected, actual);
+      {
+         String actual = HelloWorldClient.getResult();
+         String expected = "Hi " + name + ", how are you?";
+         assertEquals(expected, actual);
+      }
+      
+      {
+         int actual = HelloWorldClient.getPostConstructCalls();
+         int expected = 1;
+         assertEquals("postConstruct should be called once", expected, actual);
+      }
    }
    
    public static Test suite() throws Exception