[jboss-cvs] JBossAS SVN: r72622 - in trunk/ejb3: src/resources and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 23 10:01:33 EDT 2008
Author: jesper.pedersen
Date: 2008-04-23 10:01:33 -0400 (Wed, 23 Apr 2008)
New Revision: 72622
Removed:
trunk/ejb3/build-test-wls.xml
trunk/ejb3/src/resources/standalone/
trunk/ejb3/src/resources/test/standalone/
trunk/ejb3/src/resources/test/standaloneWar/
trunk/ejb3/src/resources/test/wls/
trunk/ejb3/src/test/EmbeddedEJB3.jsp
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/
trunk/ejb3/src/test/org/jboss/ejb3/test/wls/
Modified:
trunk/ejb3/build-test.xml
Log:
[EJBTHREE-1304] Remove embedded from EJB3 core
Deleted: trunk/ejb3/build-test-wls.xml
===================================================================
--- trunk/ejb3/build-test-wls.xml 2008-04-23 14:01:12 UTC (rev 72621)
+++ trunk/ejb3/build-test-wls.xml 2008-04-23 14:01:33 UTC (rev 72622)
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="deploy-war" basedir=".">
-
- <property environment="env"/>
- <property name="src.dir" value="${basedir}/src/test"/>
- <property name="build.dir" value="${basedir}/output"/>
- <property name="reports.dir" value="${build.dir}/reports"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="lib.dir" value="output/lib/embeddable/lib"/>
- <property name="conf.dir" value="output/lib/embeddable/conf"/>
- <property name="deploy.dir" value="/bea/weblogic90/server/jbossConfig"/>
- <property name="resources.dir" value="${basedir}/src/resources/test/wls/embeddedwar"/>
-
- <!-- Build classpath -->
- <path id="build.classpath">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${conf.dir}"/>
- </path>
-
- <!-- Client classpath -->
- <path id="client.classpath">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${conf.dir}"/>
- <pathelement location="${build.classes.dir}"/>
- </path>
-
-
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${build.classes.dir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compiles the source code -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare">
- <javac srcdir="${src.dir}"
- destdir="${build.classes.dir}"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**/wls/**">
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- Create the jndi test war -->
- <!-- =================================================================== -->
- <target name="jndi-war" depends="prepare">
- <war warfile="${build.dir}/jndi-test.war"
- webxml="${resources.dir}/WEB-INF/jndi-web.xml">
- <fileset dir="${src.dir}/org/jboss/ejb3/test/wls/embeddedwar">
- <include name="JndiTest.jsp"/>
- </fileset>
- </war>
- <copy todir="${deploy.dir}" filtering="yes">
- <fileset dir="${build.dir}">
- <include name="jndi-test.war"/>
- </fileset>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Create the war -->
- <!-- =================================================================== -->
- <target name="war" depends="compile">
- <jar jarfile="${build.dir}/tutorial.jar">
- <fileset dir="${build.classes.dir}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir="${resources.dir}">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
- <war warfile="${build.dir}/standalone.war"
- webxml="${resources.dir}/WEB-INF/web.xml">
- <!--webinf dir="${resources.dir}/WEB-INF">
- <include name="weblogic.xml"/>
- </webinf-->
- <lib dir="${lib.dir}">
- <include name="*.jar"/>
- </lib>
- <lib dir="${build.dir}">
- <include name="tutorial.jar"/>
- </lib>
- <classes dir="${resources.dir}/conf">
- <include name="*.xml"/>
- </classes>
- <classes dir="${conf.dir}">
- <include name="*.xml"/>
- <include name="*.properties"/>
- </classes>
- <fileset dir="${src.dir}/org/jboss/ejb3/test/wls/embeddedwar">
- <include name="EmbeddedEJB3.jsp"/>
- </fileset>
- </war>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- deploy the WAR file -->
- <!-- =================================================================== -->
- <target name="deploy-war" depends="war">
- <copy todir="${deploy.dir}" filtering="yes">
- <fileset dir="${build.dir}">
- <include name="standalone.war"/>
- </fileset>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Run the client -->
- <!-- =================================================================== -->
- <target name="run" depends="war">
- <junit printsummary="yes" fork="yes" showoutput="false">
- <classpath refid="client.classpath" />
- <formatter type="xml" />
- <batchtest todir="${build.dir}/reports">
- <fileset dir="${build.classes.dir}">
- <include name="**/wls/**/*TestCase.class" />
- </fileset>
- </batchtest>
- </junit>
- <junitreport todir="${build.dir}/reports">
- <report todir="${build.dir}/reports"/>
- </junitreport>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Cleans up generated stuff -->
- <!-- =================================================================== -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- </target>
-
-
-</project>
-
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2008-04-23 14:01:12 UTC (rev 72621)
+++ trunk/ejb3/build-test.xml 2008-04-23 14:01:33 UTC (rev 72622)
@@ -2927,13 +2927,6 @@
-->
</jar>
- <!--
- <copy todir="${build.lib}/embeddable/standalone">
- <fileset dir="${build.lib}">
- <include name="mdbtopic-test.jar"/>
- </fileset>
- </copy>
- -->
</target>
<target name="concurrent"
@@ -3954,7 +3947,7 @@
aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
securitydomain, enventry, security5,
jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
- exception, dd/override, stateless, standalone-jar, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
+ exception, dd/override, stateless, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob, cache, initial,
timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
@@ -4208,117 +4201,6 @@
</junit>
</target>
- <target name="standalone-jar"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}/embeddable/standalone"/>
-
- <jar jarfile="${build.lib}/embeddable/standalone/standalone.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/unit/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/test/standaloneWar">
- <include name="marker.txt"/>
- </fileset>
- <fileset dir="${build.resources}/test/standalone">
- <include name="deployer.xml"/>
- <include name="kernel-test.xml"/>
- </fileset>
- <fileset dir="${resources}/test/standalone">
- <include name="META-INF/persistence.xml"/>
- <include name="META-INF/ejb-jar.xml"/>
- </fileset>
- </jar>
-
- <war warfile="${build.lib}/standalone.war"
- webxml="${build.resources}/test/standaloneWar/WEB-INF/web.xml">
- <lib dir="${module.output}/lib/embeddable/lib">
- <include name="*.jar"/>
- </lib>
- <!--lib dir="${module.output}/lib/embeddable/conf/">
- <include name="standalone.jar"/>
- </lib-->
- <lib dir="${build.lib}/embeddable/standalone">
- <include name="*.jar"/>
- </lib>
- <!--classes dir="${module.output}/lib/embeddable/conf">
- <include name="*.xml"/>
- <include name="default.persistence.properties"/>
- </classes-->
- <fileset dir="${source.java}">
- <include name="EmbeddedEJB3.jsp"/>
- </fileset>
- </war>
-
- <jar jarfile="${build.lib}/embeddable/standalone/jms.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/jms/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/jms/unit/*.class"/>
- </fileset>
- </jar>
-
- <mkdir dir="${build.lib}/embeddable/standalone/standard"/>
- <copy todir="${build.lib}/embeddable/standalone/standard" file="${build.resources}/test/standalone/standard/testjms.xml"/>
- <copy todir="${build.lib}/embeddable/standalone/standard" file="${build.resources}/test/standalone/standard/jca-inflowmdb-beans.xml"/>
-
- <mkdir dir="${build.lib}/embeddable/standalone/embeddedjms"/>
- <copy todir="${build.lib}/embeddable/standalone/embeddedjms" file="${build.resources}/test/standalone/embeddedjms/testjms.xml"/>
- <jar jarfile="${build.lib}/embeddable/standalone/mdb.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/embeddedjms/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/embeddedjms/unit/*.class"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-session1.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/*1*.class"/>
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/unit/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/flushmodenever/session1">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-session2.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/*2*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/flushmodenever/session2">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-util.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/Util.class"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/embedded-security.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/security/**/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/security/">
- <include name="*.properties"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/embedded-servicepojo.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/servicepojo/**/*.class"/>
- </fileset>
- <!--
- <fileset dir="${resources}/test/standalone/servicepojo/">
- <include name="*.properties"/>
- </fileset>
- -->
- </jar>
-
- </target>
-
<target name="client14-tests" depends="init"
description="Execute all tests for Java1.4 client compatibility.">
<mkdir dir="${build.reports}"/>
@@ -4404,62 +4286,6 @@
</junit>
</target>
-
- <target name="standalone-test" depends="init" if="test"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <path id="standalone.classpath">
- <fileset dir="${module.output}/lib/embeddable/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${module.output}/lib/embeddable/conf"/>
- <pathelement location="${module.output}/lib/embeddable/lib"/>
- <pathelement location="${build.lib}/embeddable/standalone"/>
- <pathelement location="${build.lib}/embeddable/standalone/standard"/>
- <!-- TODO: deployment should take care of adding jars to classpath -->
- <fileset dir="${build.lib}/embeddable/standalone">
- <include name="*.jar"/>
- </fileset>
- </path>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <jvmarg value="-Dorg.jboss.jms.asf.useold=true"/>
-
- <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-
- <classpath>
- <path refid="standalone.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- </classpath>
-
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="test-standalone-with-jboss" if="test">
<!-- For use when we're doing a standalone test with jboss -->
@@ -4550,7 +4376,6 @@
</target>
<target name="tests" depends="init" description="Execute all tests">
- <!--antcall target="standalone-tests" inheritRefs="true"/-->
<antcall target="simple-tests" inheritRefs="true"/>
<antcall target="ejb-tests" inheritRefs="true"/>
<antcall target="entity-tests" inheritRefs="true"/>
@@ -4569,30 +4394,11 @@
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
- <!--antcall target="standalone-tests" inheritRefs="true"/-->
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
</target>
- <target name="standalone-tests" depends="init">
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/flushmodenever"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/embeddedjms"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/security"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/servicepojo"/>
- </antcall>
- </target>
-
<target name="simple-tests" depends="init">
<antcall target="test" inheritRefs="true">
<param name="test" value="cachepassivation"/>
Deleted: trunk/ejb3/src/test/EmbeddedEJB3.jsp
===================================================================
--- trunk/ejb3/src/test/EmbeddedEJB3.jsp 2008-04-23 14:01:12 UTC (rev 72621)
+++ trunk/ejb3/src/test/EmbeddedEJB3.jsp 2008-04-23 14:01:33 UTC (rev 72622)
@@ -1,52 +0,0 @@
-<%@ page import="java.util.Hashtable,
- javax.ejb.EJBNoSuchObjectException,
- javax.naming.InitialContext,
- javax.naming.NamingException,
- org.jboss.ejb3.test.standalone.Customer,
- org.jboss.ejb3.test.standalone.CustomerDAO,
- org.jboss.ejb3.test.standalone.ShoppingCart" %>
-
-<%!
-
- private void executeEJBs(InitialContext ctx)
- throws NamingException
- {
- CustomerDAO local = (CustomerDAO) ctx.lookup(CustomerDAO.class.getName());
- long id = local.createCustomer();
- Customer cust = local.findCustomer(id);
-
- if (!"Bill".equals(cust.getName())) throw new RuntimeException("FAILURE");
-
- ShoppingCart cart = (ShoppingCart) ctx.lookup(ShoppingCart.class.getName());
- cart.getCart().add("beer");
- cart.getCart().add("wine");
- if (2 != cart.getCart().size()) throw new RuntimeException("FAILURE");
-
- cart.checkout();
-
- boolean exceptionThrown = false;
- try
- {
- cart.getCart();
- }
- catch (EJBNoSuchObjectException e)
- {
- exceptionThrown = true;
- }
- if (!exceptionThrown) throw new RuntimeException("Exception should have been thrown");
- }
-
-
-%>
-
-<html>
-<body>
-<%
- Hashtable properties = new Hashtable();
- properties.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
- properties.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- executeEJBs(new InitialContext(properties));
-%>
-DONE!
-</body>
-</html>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list