[jboss-cvs] JBossAS SVN: r70341 - in projects/ejb3/trunk/core/src/test: java/org/jboss/ejb3/test/servlet/servlets and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 3 19:33:55 EST 2008
Author: bdecoste
Date: 2008-03-03 19:33:54 -0500 (Mon, 03 Mar 2008)
New Revision: 70341
Added:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Home.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30LocalHome.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
projects/ejb3/trunk/core/src/test/resources/test/servlet/META-INF/application.xml
projects/ejb3/trunk/core/src/test/resources/test/servlet/WEB-INF/test-web.xml
Log:
fixed servlet test - EarServletUnitTestCase is still failing but only when the ear is dpleoyed via the jmx deployer. Via deploy dir it works fine
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -39,8 +39,8 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
@Stateless(name="Session30")
- at Remote(Session30.class)
- at Local(Session30.class)
+ at Remote(Session30Remote.class)
+ at Local(Session30Local.class)
@RemoteBinding(jndiBinding = "ejb/Session30")
@LocalBinding(jndiBinding = "ejb/Session30Local")
@RemoteHome(Session30Home.class)
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Home.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Home.java 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Home.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -29,6 +29,6 @@
*/
public interface Session30Home extends EJBHome
{
- public Session30 create() throws javax.ejb.CreateException;
+ public Session30Remote create() throws javax.ejb.CreateException;
}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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;
+
+import javax.ejb.EJBLocalObject;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30Local extends EJBLocalObject
+{
+ void hello();
+
+ void goodbye();
+
+ String access(TestObject o);
+
+ TestObject createTestObject();
+
+ boolean checkEqPointer(TestObject to);
+
+ WarTestObject getWarTestObject();
+}
+
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30LocalHome.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30LocalHome.java 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30LocalHome.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -29,6 +29,6 @@
*/
public interface Session30LocalHome extends EJBLocalHome
{
- public Session30 create() throws javax.ejb.CreateException;
+ public Session30Local create() throws javax.ejb.CreateException;
}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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;
+
+import javax.ejb.EJBObject;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30Remote extends EJBObject
+{
+ void hello();
+
+ void goodbye();
+
+ String access(TestObject o);
+
+ TestObject createTestObject();
+
+ boolean checkEqPointer(TestObject to);
+
+ WarTestObject getWarTestObject();
+}
+
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-03-04 00:33:54 UTC (rev 70341)
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.ejb3.test.servlet.Session30;
+import org.jboss.ejb3.test.servlet.Session30Local;
+import org.jboss.ejb3.test.servlet.Session30Remote;
import org.jboss.ejb3.test.servlet.Session30LocalHome;
import org.jboss.ejb3.test.servlet.Session30Home;
import org.jboss.ejb3.test.servlet.StatelessLocal;
@@ -52,7 +53,7 @@
private static final Logger log = Logger.getLogger(EJBServlet.class);
@EJB
- Session30 injectedSession;
+ Session30Remote injectedSession;
@EJB
StatelessLocal injectedStateful;
@@ -73,37 +74,37 @@
InitialContext ctx = new InitialContext();
- Session30 session = (Session30)ctx.lookup("ejb/Session30");
+ Session30Remote remote = (Session30Remote)ctx.lookup("ejb/Session30");
- session.hello();
- session.goodbye();
+ remote.hello();
+ remote.goodbye();
TestObject o = new TestObject();
- session.access(o);
- o = session.createTestObject();
+ remote.access(o);
+ o = remote.createTestObject();
- session = (Session30)ctx.lookup("ejb/Session30Local");
+ Session30Local local = (Session30Local)ctx.lookup("ejb/Session30Local");
o = new TestObject();
- session.access(o);
- o = session.createTestObject();
+ local.access(o);
+ o = local.createTestObject();
- WarTestObject warObject = (WarTestObject)session.getWarTestObject();
+ WarTestObject warObject = (WarTestObject)local.getWarTestObject();
Session30Home home = (Session30Home)ctx.lookup("Session30/home");
- session = home.create();
- session.access(o);
+ remote = home.create();
+ remote.access(o);
Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("Session30/localHome");
- session = localHome.create();
- session.access(o);
+ local = localHome.create();
+ local.access(o);
home = (Session30Home)ctx.lookup("java:comp/env/ejb/remote/Session30");
- session = home.create();
- session.access(o);
+ remote = home.create();
+ remote.access(o);
localHome = (Session30LocalHome)ctx.lookup("java:comp/env/ejb/local/Session30");
- session = localHome.create();
- session.access(o);
+ local = localHome.create();
+ local.access(o);
}
catch (Exception e)
{
Modified: projects/ejb3/trunk/core/src/test/resources/test/servlet/META-INF/application.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/servlet/META-INF/application.xml 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/resources/test/servlet/META-INF/application.xml 2008-03-04 00:33:54 UTC (rev 70341)
@@ -4,11 +4,10 @@
<display-name>EJB3 Web Container Testsuite</display-name>
<module>
- <web>
- <description>The testsuite war</description>
- <web-uri>servlet.war</web-uri>
- <context-root>/servlet</context-root>
- </web>
+ <web>
+ <web-uri>servlet.war</web-uri>
+ <context-root>/servlet</context-root>
+ </web>
</module>
<module>
Modified: projects/ejb3/trunk/core/src/test/resources/test/servlet/WEB-INF/test-web.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/servlet/WEB-INF/test-web.xml 2008-03-03 22:34:38 UTC (rev 70340)
+++ projects/ejb3/trunk/core/src/test/resources/test/servlet/WEB-INF/test-web.xml 2008-03-04 00:33:54 UTC (rev 70341)
@@ -5,9 +5,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/j2ee/web-app_2_4.xsd">
-
- <description>EJB3 Servlet Access Test</description>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
More information about the jboss-cvs-commits
mailing list