[jboss-cvs] JBossAS SVN: r99974 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/test/org/jboss/ejb3/test/invoker and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2010-01-26 21:22:19 -0500 (Tue, 26 Jan 2010)
New Revision: 99974

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessSSLBean.java
Log:
Update org.jboss.ejb3.test.invoker.unit.InvokerTestCase to use @RemoteBindings URL which is based on testsuite bind address (JBPAPP-2997)

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2010-01-27 01:26:44 UTC (rev 99973)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2010-01-27 02:22:19 UTC (rev 99974)
@@ -417,7 +417,36 @@
          <exclude name="org/jboss/ejb3/test/jaxws/**"/>
          <exclude name="org/jboss/ejb3/test/webservices/**"/>
          <exclude name="org/jboss/ejb3/test/standalone/**"/>
+         <exclude name="org/jboss/ejb3/test/invoker/**"/>
       </javac>
+	
+	  <!-- special treatment for org.jboss.ejb3.test.invoker.unit.InvokerTestCase -->
+	  <!-- classes need an EJB3 annotation URL to be adjusted (JBPAPP-2997) -->
+	  <mkdir dir="${module.output}/tmpdir"/>
+	  <copy todir="${module.output}/tmpdir">
+        <fileset dir="${source.java}">
+          <include name="org/jboss/ejb3/test/invoker/**/*.java"/>
+        </fileset>
+        <filterset>
+          <filter token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+        </filterset>
+      </copy>
+      <javac destdir="${build.classes}"
+         optimize="${javac.optimize}"
+         debug="${javac.debug}"
+         source="1.5"
+         target="1.5"
+         depend="${javac.depend}"
+         verbose="${javac.verbose}"
+         deprecation="${javac.deprecation}"
+         includeAntRuntime="${javac.include.ant.runtime}"
+         includeJavaRuntime="${javac.include.java.runtime}"
+         failonerror="${javac.fail.onerror}">
+         <src path="${module.output}/tmpdir"/>
+         <classpath refid="javac.classpath"/>
+      </javac>
+	  <delete dir="${module.output}/tmpdir"/>
+
    </target>
 
    <target name="compile-stylesheets">

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	2010-01-27 01:26:44 UTC (rev 99973)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	2010-01-27 02:22:19 UTC (rev 99974)
@@ -31,10 +31,12 @@
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  * @version $Revision$
+ * 
+ * JBPAPP-2997: Changed URL to reflect testsuite bind address. 
  */
 @Stateless
 @RemoteBindings({
-  @RemoteBinding(clientBindUrl="http://localhost:8080/servlet-invoker/ServerInvokerServlet", jndiBinding="StatelessHttp")
+  @RemoteBinding(clientBindUrl="http://@JBOSS_BIND_URL_ADDRESS@:8080/servlet-invoker/ServerInvokerServlet", jndiBinding="StatelessHttp")
 })
 @Remote(StatelessRemote.class)
 public class StatelessBean implements StatelessRemote

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessSSLBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessSSLBean.java	2010-01-27 01:26:44 UTC (rev 99973)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessSSLBean.java	2010-01-27 02:22:19 UTC (rev 99974)
@@ -30,10 +30,12 @@
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * 
+ * JBPAPP-2997: Changed URL to reflect testsuite bind address. 
  */
 @Stateless
 @RemoteBindings({
-  @RemoteBinding(clientBindUrl="https://localhost:8443/servlet-invoker/SSLServerInvokerServlet", jndiBinding="StatelessHttps")
+  @RemoteBinding(clientBindUrl="https://@JBOSS_BIND_URL_ADDRESS@:8443/servlet-invoker/SSLServerInvokerServlet", jndiBinding="StatelessHttps")
 })
 @Remote(StatelessRemote.class)
 public class StatelessSSLBean implements StatelessRemote