[jboss-cvs] JBossAS SVN: r68117 - in trunk/testsuite: src/main/org/jboss/test/cts/ejb and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 10 13:28:16 EST 2007
Author: adrian at jboss.org
Date: 2007-12-10 13:28:16 -0500 (Mon, 10 Dec 2007)
New Revision: 68117
Removed:
trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java
trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java
Modified:
trunk/testsuite/.classpath
trunk/testsuite/build.xml
Log:
Port fix for different cts cmp versions from 4.2 and fix the eclipse classpath to include gen-src
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-12-10 18:20:28 UTC (rev 68116)
+++ trunk/testsuite/.classpath 2007-12-10 18:28:16 UTC (rev 68117)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/jboss/test/recover/derby/EmbeddedDerbyRecoverable.java|org/jboss/test/recover/oracle/OracleRecoverable.java|org/jboss/test/security/test/HttpsUnitTestCase.java" kind="src" path="src/main"/>
+ <classpathentry kind="src" path="output/gen-src"/>
<classpathentry kind="lib" path="src/resources"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-12-10 18:20:28 UTC (rev 68116)
+++ trunk/testsuite/build.xml 2007-12-10 18:28:16 UTC (rev 68117)
@@ -324,6 +324,20 @@
<target name="init">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
+ <mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
+ <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
+ <mkdir dir="${build.gen-src}/org/jboss/test/cts/service"/>
+ <copy
+ tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
+ file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
+ overwrite="false"/>
+ <copy tofile="${build.gen-src}/org/jboss/test/cts/ejb/CtsCmp2Bean.java"
+ file="${source.java}/org/jboss/test/cts/ejb/CtsCmp2Bean_V1.txt"
+ overwrite="flase"/>
+ <copy
+ tofile="${build.gen-src}/org/jboss/test/cts/service/CtsCmpService.java"
+ file="${source.java}/org/jboss/test/cts/service/CtsCmpService_V1.txt"
+ overwrite="false"/>
<mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" overwrite="false"/>
Deleted: trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java 2007-12-10 18:20:28 UTC (rev 68116)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java 2007-12-10 18:28:16 UTC (rev 68117)
@@ -1,80 +0,0 @@
-package org.jboss.test.cts.ejb;
-
-import javax.ejb.CreateException;
-import javax.ejb.CreateException;
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-
-import org.jboss.logging.Logger;
-
-/**
- @author Scott.Stark at jboss.org
- @version $Revision: 23153 $
- */
-public abstract class CtsCmp2Bean implements EntityBean
-{
- private static String VERSION = "CtsCmp2BeanV2";
- private static Logger log = Logger.getLogger(CtsCmp2Bean.class);
- private EntityContext ctx;
-
- public String ejbCreate(String key, String data)
- throws CreateException
- {
- log.debug("ejbCreate '" + key + "' "+ data+", version="+VERSION);
- setKey(key);
- setData(data);
- return null;
- }
-
- public void ejbPostCreate(String key, String data)
- {
- log.debug("ejbPostCreate'" + key + "' "+ data);
- }
-
- // CMP field accessors -----------------------------------------------------
- public abstract String getKey();
- public abstract void setKey(String param);
- public abstract String getData();
- public abstract void setData(String param);
- public abstract String getMoreData();
- public abstract void setMoreData(String param);
-
-// EJB callbacks
- public void ejbLoad ()
- {
- log.debug("ejbLoad () called");
-
- }
-
- public void ejbStore ()
- {
- log.debug("ejbStore () called");
- }
-
- public void ejbRemove ()
- {
- log.debug("ejbRemove () called");
- }
-
- public void ejbActivate ()
- {
- log.debug("ejbActivate () called");
- }
-
- public void ejbPassivate ()
- {
- log.debug("ejbPassivate () called");
- }
-
- public void setEntityContext (EntityContext ctx)
- {
- log.debug("setEntityContext () called");
- this.ctx = ctx;
- }
-
- public void unsetEntityContext ()
- {
- log.debug("unsetEntityContext () called");
- ctx = null;
- }
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java 2007-12-10 18:20:28 UTC (rev 68116)
+++ trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java 2007-12-10 18:28:16 UTC (rev 68117)
@@ -1,14 +0,0 @@
-package org.jboss.test.cts.interfaces;
-
-import javax.ejb.EJBLocalObject;
-
-/**
- @author Scott.Stark at jboss.org
- @version $Revision: 8726 $
- */
-public interface CtsCmp2Local extends EJBLocalObject
-{
- public String getKey();
- public String getData();
- public String getMoreData();
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java 2007-12-10 18:20:28 UTC (rev 68116)
+++ trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java 2007-12-10 18:28:16 UTC (rev 68117)
@@ -1,58 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE WebOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.test.cts.service;
-
-import javax.naming.InitialContext;
-
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.test.cts.interfaces.CtsCmp2Local;
-import org.jboss.test.cts.interfaces.CtsCmp2LocalHome;
-import org.jboss.test.util.Debug;
-
-/** Version 2 of the MBean service that uses the version 2 of the
- * CtsCmp2Local EJB interface.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 16662 $
- */
-public class CtsCmpService extends ServiceMBeanSupport
- implements CtsCmpServiceMBean
-{
- private CtsCmp2LocalHome home;
- private String homeJndiName = "v2/local/CtsCmp2Bean";
-
- public CtsCmpService()
- {
- log.info("CtsCmpService V2 ctor");
- }
-
- public void setHomeJndiName(String jndiName)
- {
- this.homeJndiName = jndiName;
- }
-
- protected void startService() throws Exception
- {
- InitialContext ctx = new InitialContext();
- Object obj = new InitialContext().lookup(homeJndiName);
- Class homeClass = obj.getClass();
- StringBuffer results = new StringBuffer();
- results.append("CtsCmpService V2 class info:\n");
- Debug.displayClassInfo(getClass(), results);
- results.append("CtsCmp2LocalHome Proxy class info:\n");
- Debug.displayClassInfo(homeClass, results);
- results.append("\nLocal CtsCmp2LocalHome.class info:\n");
- Debug.displayClassInfo(CtsCmp2LocalHome.class, results);
- log.info(results.toString());
- home = (CtsCmp2LocalHome) obj;
-
- CtsCmp2Local bean = home.create("V2key", "V2data");
- log.info("CtsCmp2Local.key = "+bean.getKey());
- log.info("CtsCmp2Local.data = "+bean.getData());
- log.info("CtsCmp2Local.moreData = "+bean.getMoreData());
- }
-}
More information about the jboss-cvs-commits
mailing list