[jboss-cvs] JBossAS SVN: r82338 - in trunk/testsuite: src/main/org/jboss/test/ejb3 and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 17 05:15:45 EST 2008
Author: wolfc
Date: 2008-12-17 05:15:45 -0500 (Wed, 17 Dec 2008)
New Revision: 82338
Added:
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/
trunk/testsuite/src/resources/ejb3/servlet/
Modified:
trunk/testsuite/imports/sections/ejb3.xml
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Bean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessLocal.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessRemote.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Home.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Local.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30LocalHome.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Remote.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulLocal.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulRemote.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessLocal.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/TestObject.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/WarTestObject.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java
trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java
trunk/testsuite/src/resources/ejb3/servlet/META-INF/application.xml
trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/jboss-web.xml
trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/test-web.xml
Log:
EJBTHREE-1241: moved servlet unit test to AS testsuite
Modified: trunk/testsuite/imports/sections/ejb3.xml
===================================================================
--- trunk/testsuite/imports/sections/ejb3.xml 2008-12-17 09:14:10 UTC (rev 82337)
+++ trunk/testsuite/imports/sections/ejb3.xml 2008-12-17 10:15:45 UTC (rev 82338)
@@ -37,8 +37,65 @@
<fileset dir="${source.resources}/ejb3/ejbthree1597" includes="**"></fileset>
</jar>
</target>
-
- <target name="_jars-ejb3" depends="jbas6161,jbas6239,ejbthree1597">
+
+ <target name="ejb3-servlet" depends="compile"
+ description="Builds all jar files."
+ >
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejb3-servlet-ejbs.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ejb3/servlet/*.class"/>
+ <exclude name="org/jboss/test/ejb3/servlet/War*.class"/>
+ </fileset>
+ <fileset dir="${source.resources}/ejb3/servlet">
+ <include name="*.properties"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/ejb3-servlet-client.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ejb3/servlet/War*.class"/>
+ </fileset>
+ </jar>
+
+ <war warfile="${build.lib}/ejb3-servlet.war"
+ webxml="${source.resources}/ejb3/servlet/WEB-INF/test-web.xml">
+ <webinf dir="${source.resources}/ejb3/servlet/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/ejb3/servlet/servlets/**"/>
+ </classes>
+ <lib dir="${build.lib}">
+ <include name="ejb3-servlet-client.jar"/>
+ </lib>
+ </war>
+
+ <ear earfile="${build.lib}/ejb3-servlet.ear"
+ appxml="${source.resources}/ejb3/servlet/META-INF/application.xml"
+ manifest="${source.resources}/ejb3/servlet/META-INF/MANIFEST.MF">
+ <fileset dir="${build.lib}">
+ <include name="ejb3-servlet-ejbs.jar"/>
+ <include name="ejb3-servlet.war"/>
+ <include name="ejb3-servlet-client.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/ejb3/servlet">
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="servlet-security-service.xml"/>
+ </fileset>
+ </ear>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${source.resources}/ejb3/servlet">
+ <include name="servlet-security-service.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="_jars-ejb3" depends="ejb3-servlet,jbas6161,jbas6239,ejbthree1597">
<mkdir dir="${build.lib}" />
<!-- A jar with a simple ejb3 session -->
Copied: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet (from rev 82334, projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet)
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Bean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Bean.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
@@ -30,7 +30,9 @@
import javax.ejb.Stateless;
import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
@@ -44,7 +46,9 @@
@RemoteBinding(jndiBinding = "ejb/Session30")
@LocalBinding(jndiBinding = "ejb/Session30Local")
@RemoteHome(Session30Home.class)
+ at RemoteHomeBinding(jndiBinding="ejb/Session30Home")
@LocalHome(Session30LocalHome.class)
+ at LocalHomeBinding(jndiBinding="ejb/Session30LocalHome")
@SecurityDomain("userinrole")
public class Session30Bean implements Session30
{
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessLocal.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessLocal.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessLocal.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.Local;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessRemote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessRemote.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30BusinessRemote.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.Remote;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Home.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Home.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Home.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,9 +19,9 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
-import javax.ejb.*;
+import javax.ejb.EJBHome;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Local.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Local.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.EJBLocalObject;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30LocalHome.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30LocalHome.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30LocalHome.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,9 +19,9 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
-import javax.ejb.*;
+import javax.ejb.EJBLocalHome;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Remote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/Session30Remote.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.EJBObject;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/StatefulBean.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulBean.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.Local;
import javax.ejb.Remote;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulLocal.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/StatefulLocal.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulLocal.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulRemote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/StatefulRemote.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatefulRemote.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/StatelessBean.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessBean.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,10 +19,9 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
import javax.ejb.Local;
-import javax.ejb.Stateless;
import javax.ejb.Stateful;
import org.jboss.logging.Logger;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessLocal.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/StatelessLocal.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/StatelessLocal.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision: 61136 $</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/TestObject.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/TestObject.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/TestObject.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/WarTestObject.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/WarTestObject.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/WarTestObject.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet;
+package org.jboss.test.ejb3.servlet;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet.servlets;
+package org.jboss.test.ejb3.servlet.servlets;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,17 +32,17 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.ejb3.test.servlet.Session30BusinessLocal;
-import org.jboss.ejb3.test.servlet.Session30BusinessRemote;
-import org.jboss.ejb3.test.servlet.Session30Home;
-import org.jboss.ejb3.test.servlet.Session30Local;
-import org.jboss.ejb3.test.servlet.Session30LocalHome;
-import org.jboss.ejb3.test.servlet.Session30Remote;
-import org.jboss.ejb3.test.servlet.StatelessLocal;
-import org.jboss.ejb3.test.servlet.TestObject;
import org.jboss.logging.Logger;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
+import org.jboss.test.ejb3.servlet.Session30BusinessLocal;
+import org.jboss.test.ejb3.servlet.Session30BusinessRemote;
+import org.jboss.test.ejb3.servlet.Session30Home;
+import org.jboss.test.ejb3.servlet.Session30Local;
+import org.jboss.test.ejb3.servlet.Session30LocalHome;
+import org.jboss.test.ejb3.servlet.Session30Remote;
+import org.jboss.test.ejb3.servlet.StatelessLocal;
+import org.jboss.test.ejb3.servlet.TestObject;
/** A servlet that accesses an EJB and tests whether the call argument
is serialized.
@@ -94,11 +94,11 @@
// FIXME: this makes the servlet hang sometimes in Class.defineClass1()
//WarTestObject warObject = (WarTestObject)local.getWarTestObject();
- Session30Home home = (Session30Home)ctx.lookup("Session30/home");
+ Session30Home home = (Session30Home)ctx.lookup("ejb/Session30Home");
Session30Remote remote21 = home.create();
remote21.access(o);
- Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("Session30/localHome");
+ Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("ejb/Session30LocalHome");
Session30Local local21 = localHome.create();
local21.access(o);
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet.unit;
+package org.jboss.test.ejb3.servlet.unit;
import javax.management.Attribute;
import javax.management.MBeanServerConnection;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet.unit;
+package org.jboss.test.ejb3.servlet.unit;
import java.io.IOException;
import java.net.URL;
@@ -77,7 +77,7 @@
*/
public static Test suite() throws Exception
{
- return getDeploySetup(EarServletUnitTestCase.class, "servlet.ear");
+ return getDeploySetup(EarServletUnitTestCase.class, "ejb3-servlet.ear");
}
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/HttpUtils.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,22 +19,22 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet.unit;
+package org.jboss.test.ejb3.servlet.unit;
+import java.io.IOException;
+import java.net.HttpURLConnection;
import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.IOException;
-import java.lang.System;
+
+import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.DeleteMethod;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.HeadMethod;
import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
import org.apache.commons.httpclient.methods.TraceMethod;
import org.jboss.logging.Logger;
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java 2008-12-17 08:03:58 UTC (rev 82334)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.java 2008-12-17 10:15:45 UTC (rev 82338)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.servlet.unit;
+package org.jboss.test.ejb3.servlet.unit;
import java.io.IOException;
import java.net.URL;
@@ -77,7 +77,7 @@
*/
public static Test suite() throws Exception
{
- return getDeploySetup(ServletUnitTestCase.class, "servlet-security-service.xml, servlet-client.jar, servlet-ejbs.jar, servlet.war");
+ return getDeploySetup(ServletUnitTestCase.class, "servlet-security-service.xml, ejb3-servlet-client.jar, ejb3-servlet-ejbs.jar, ejb3-servlet.war");
}
Copied: trunk/testsuite/src/resources/ejb3/servlet (from rev 82337, projects/ejb3/trunk/testsuite/src/test/resources/test/servlet)
Modified: trunk/testsuite/src/resources/ejb3/servlet/META-INF/application.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/application.xml 2008-12-17 09:14:10 UTC (rev 82337)
+++ trunk/testsuite/src/resources/ejb3/servlet/META-INF/application.xml 2008-12-17 10:15:45 UTC (rev 82338)
@@ -10,17 +10,17 @@
<module>
<web>
- <web-uri>servlet.war</web-uri>
+ <web-uri>ejb3-servlet.war</web-uri>
<context-root>/servlet</context-root>
</web>
</module>
<module>
- <ejb>servlet-client.jar</ejb>
+ <ejb>ejb3-servlet-client.jar</ejb>
</module>
<module>
- <ejb>servlet-ejbs.jar</ejb>
+ <ejb>ejb3-servlet-ejbs.jar</ejb>
</module>
</application>
Modified: trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/jboss-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/WEB-INF/jboss-web.xml 2008-12-17 09:14:10 UTC (rev 82337)
+++ trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/jboss-web.xml 2008-12-17 10:15:45 UTC (rev 82338)
@@ -18,12 +18,12 @@
<ejb-ref>
<ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
- <jndi-name>Session30/home</jndi-name>
+ <jndi-name>ejb/Session30Home</jndi-name>
</ejb-ref>
<ejb-local-ref>
<ejb-ref-name>ejb/local/Session30</ejb-ref-name>
- <local-jndi-name>Session30/localHome</local-jndi-name>
+ <local-jndi-name>ejb/Session30LocalHome</local-jndi-name>
</ejb-local-ref>
</jboss-web>
Modified: trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/test-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/WEB-INF/test-web.xml 2008-12-17 09:14:10 UTC (rev 82337)
+++ trunk/testsuite/src/resources/ejb3/servlet/WEB-INF/test-web.xml 2008-12-17 10:15:45 UTC (rev 82338)
@@ -18,7 +18,7 @@
<servlet>
<servlet-name>EJBServlet</servlet-name>
- <servlet-class>org.jboss.ejb3.test.servlet.servlets.EJBServlet</servlet-class>
+ <servlet-class>org.jboss.test.ejb3.servlet.servlets.EJBServlet</servlet-class>
</servlet>
<!-- The servlet and jsp page mappings -->
@@ -30,15 +30,15 @@
<ejb-ref>
<ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.ejb3.test.servlet.Session30Home</home>
- <remote>org.jboss.ejb3.test.servlet.Session30Remote</remote>
+ <home>org.jboss.test.ejb3.servlet.Session30Home</home>
+ <remote>org.jboss.test.ejb3.servlet.Session30Remote</remote>
</ejb-ref>
<ejb-local-ref>
<ejb-ref-name>ejb/local/Session30</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jboss.ejb3.test.servlet.Session30LocalHome</local-home>
- <local>org.jboss.ejb3.test.servlet.Session30Local</local>
+ <local-home>org.jboss.test.ejb3.servlet.Session30LocalHome</local-home>
+ <local>org.jboss.test.ejb3.servlet.Session30Local</local>
</ejb-local-ref>
<security-role>
More information about the jboss-cvs-commits
mailing list