[jboss-cvs] JBossAS SVN: r82276 - in projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet: servlets and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 15 04:50:38 EST 2008
Author: wolfc
Date: 2008-12-15 04:50:38 -0500 (Mon, 15 Dec 2008)
New Revision: 82276
Added:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessLocal.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessRemote.java
Modified:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
Log:
EJBTHREE-1241: untangle EJB 2.1 and EJB 3 views
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Bean.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -39,8 +39,8 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
@Stateless(name="Session30")
- at Remote(Session30Remote.class)
- at Local(Session30Local.class)
+ at Remote(Session30BusinessRemote.class)
+ at Local(Session30BusinessLocal.class)
@RemoteBinding(jndiBinding = "ejb/Session30")
@LocalBinding(jndiBinding = "ejb/Session30Local")
@RemoteHome(Session30Home.class)
Added: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessLocal.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessLocal.java (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessLocal.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.Local;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Local
+public interface Session30BusinessLocal extends Session30
+{
+
+}
Added: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessRemote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessRemote.java (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30BusinessRemote.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.Remote;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Remote
+public interface Session30BusinessRemote extends Session30
+{
+
+}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Local.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -26,18 +26,7 @@
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
-public interface Session30Local extends EJBLocalObject
+public interface Session30Local extends EJBLocalObject, Session30
{
- void hello();
-
- void goodbye();
-
- String access(TestObject o);
-
- TestObject createTestObject();
-
- boolean checkEqPointer(TestObject to);
-
- WarTestObject getWarTestObject();
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/Session30Remote.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -26,18 +26,7 @@
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
-public interface Session30Remote extends EJBObject
+public interface Session30Remote extends EJBObject, Session30
{
- void hello();
-
- void goodbye();
-
- String access(TestObject o);
-
- TestObject createTestObject();
-
- boolean checkEqPointer(TestObject to);
-
- WarTestObject getWarTestObject();
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.ejb.EJB;
import javax.naming.InitialContext;
import javax.naming.NamingEnumeration;
@@ -31,16 +32,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+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.Session30LocalHome;
-import org.jboss.ejb3.test.servlet.Session30Home;
import org.jboss.ejb3.test.servlet.StatelessLocal;
import org.jboss.ejb3.test.servlet.TestObject;
import org.jboss.ejb3.test.servlet.WarTestObject;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
@@ -55,7 +55,7 @@
private static final Logger log = Logger.getLogger(EJBServlet.class);
@EJB
- Session30Remote injectedSession;
+ Session30BusinessRemote injectedSession;
@EJB
StatelessLocal injectedStateful;
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -21,6 +21,7 @@
*/
package org.jboss.ejb3.test.servlet.unit;
+import java.io.IOException;
import java.net.URL;
import javax.management.Attribute;
@@ -61,6 +62,10 @@
URL url = new URL(baseURL+"servlet/EJBServlet");
HttpUtils.accessURL(url);
}
+ catch(IOException e)
+ {
+ fail(e.getMessage());
+ }
finally
{
// server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java 2008-12-15 08:57:15 UTC (rev 82275)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java 2008-12-15 09:50:38 UTC (rev 82276)
@@ -21,6 +21,7 @@
*/
package org.jboss.ejb3.test.servlet.unit;
+import java.io.IOException;
import java.net.URL;
import javax.management.Attribute;
@@ -61,6 +62,10 @@
URL url = new URL(baseURL+"servlet/EJBServlet");
HttpUtils.accessURL(url);
}
+ catch(IOException e)
+ {
+ fail(e.getMessage());
+ }
finally
{
server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
More information about the jboss-cvs-commits
mailing list