[jboss-svn-commits] JBL Code SVN: r5563 - in labs/jbossesb/trunk/product: . core/common/tests/resources/conf core/common/tests/src/org/jboss/soa/esb/common/tests core/listeners core/processors core/services core/services/tests lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 7 12:54:07 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-08-07 12:54:03 -0400 (Mon, 07 Aug 2006)
New Revision: 5563
Added:
labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-deployment.xml
Removed:
labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar
labs/jbossesb/trunk/product/lib/ext/xdoclet-1.2.3.jar
labs/jbossesb/trunk/product/lib/ext/xdoclet-ejb-module-1.2.3.jar
labs/jbossesb/trunk/product/lib/ext/xdoclet-jboss-module-1.2.3.jar
labs/jbossesb/trunk/product/lib/ext/xdoclet-jmx-module-1.2.3.jar
labs/jbossesb/trunk/product/lib/ext/xdoclet-web-module-1.2.3.jar
labs/jbossesb/trunk/product/lib/ext/xjavadoc-1.5-snapshot050611.jar
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/processors/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
Log:
removing xdoclet
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/build.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -196,7 +196,7 @@
<target name="javadoc" depends="org.jboss.esb.javadocs"/>
<target name="deploy" depends="dist">
- <copy file="${org.jboss.esb.installationdirectory}/jbossesb-appl.ear"
+ <copy file="${org.jboss.esb.installationdirectory}/lib/jbossesb-appl.ear"
todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
</target>
Added: labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-deployment.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-deployment.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+
+ <bean name="EJBDeployment"
+ class="org.jboss.ejb3.embedded.EJB3StandaloneDeployer">
+ <property name="jndiProperties">
+ <inject bean="InitialContextProperties"/>
+ </property>
+ <property name="kernel">
+ <inject bean="jboss.kernel:service=Kernel"/>
+ </property>
+
+ </bean>
+
+</deployment>
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-08-07 16:54:03 UTC (rev 5563)
@@ -81,11 +81,11 @@
// Deploy CaveatEmptor beans (datasource, mostly)
EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
- //EJB3StandaloneBootstrap.deployXmlResource("ejb3-deployment.xml");
+ EJB3StandaloneBootstrap.deployXmlResource("ejb3-deployment.xml");
EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
log.info("scanClasspath: "
+ System.getProperty("java.class.path"));
- EJB3StandaloneBootstrap.scanClasspath();
+ EJB3StandaloneBootstrap.scanClasspath("");
// Create InitialContext from jndi.properties
System.setProperty("java.naming.factory.initial",
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -9,6 +9,7 @@
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" value="${basedir}/../../lib/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -23,6 +24,7 @@
<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/processors"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
+ <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
<target name="org.jboss.esb.listeners.init">
Modified: labs/jbossesb/trunk/product/core/processors/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/processors/build.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/processors/build.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -9,6 +9,7 @@
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" value="${basedir}/../../lib/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -22,6 +23,7 @@
<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
+ <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
<target name="org.jboss.esb.processors.init">
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -17,14 +17,9 @@
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
- <property name="org.jboss.esb.services.xdoclet.lib" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.serverlib.dir" value="${env.XDOCLET_HOME}/lib">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/lib">
+ <property name="org.jboss.esb.ejb3.lib.dir" value="${basedir}/../../lib/ejb3"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/lib">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -33,15 +28,10 @@
<!-- =================================================================== -->
<path id="org.jboss.esb.services.base.classpath">
<fileset dir="${org.jboss.esb.services.appl.dir}/lib" includes="*.jar,*.zip"/>
- <fileset dir="${org.jboss.esb.ext.serverlib.dir}"
- includes="*.jar,*.zip"
- />
<fileset dir="${org.jboss.esb.ext.lib.dir}"
- includes="*.jar"
+ includes="*.jar" excludes="jbossall-client.jar"
/>
- <fileset dir="${org.jboss.esb.ejb3.dir}"
- includes="*.jar"
- />
+ <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
<!-- =================================================================== -->
@@ -116,26 +106,8 @@
<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
</path>
- <path id="xdoclet.class.path">
- <fileset dir="${org.jboss.esb.services.xdoclet.lib}">
- <include name="*.jar"/>
- </fileset>
- <path refid="org.jboss.esb.services.default.classpath"/>
- </path>
<!-- =================================================================== -->
- <!-- Initialise xdoclet tasks -->
- <!-- =================================================================== -->
- <target name="org.jboss.esb.services.initXdoclet">
- <taskdef
- name="ejbdoclet"
- classname="xdoclet.modules.ejb.EjbDocletTask"
- classpathref="xdoclet.class.path"
- />
- </target>
-
-
- <!-- =================================================================== -->
<!-- Jar -->
<!-- =================================================================== -->
<target name="jar" description="Assemble jar files"
@@ -151,7 +123,7 @@
</target>
<target name="-ear">
- <ear destfile="${org.jboss.esb.services.dist.dir}/jbossesb-appl.ear"
+ <ear destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-appl.ear"
appxml="${org.jboss.esb.services.metainf.dir}/application.xml">
<fileset dir="${org.jboss.esb.services.dist.dir}"
includes="jbossesb-common.jar
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-07 15:56:29 UTC (rev 5562)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-07 16:54:03 UTC (rev 5563)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
- <property file="../../../deployment.properties"/>
+ <property file="../../../../config/deployment.properties"/>
<property name="org.jboss.esb.module.src.dir" value="../src"/>
<property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
@@ -9,20 +9,24 @@
<property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
+
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
+ <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/common/tests/resources/conf"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar emma.jar emma_ant.jar"/>
+ includes="activation.jar log4j.jar mail.jar junit.jar emma.jar emma_ant.jar"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
-
+ <pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
+ <fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="*.jar"/>
</path>
<target name="org.jboss.esb.tests.init">
@@ -106,7 +110,7 @@
<!-- Need the tests src folder because there may be non-compiled test resources -->
<pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
<path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.ejb3.lib.dir}"/>
+
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
Deleted: labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xdoclet-1.2.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xdoclet-ejb-module-1.2.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xdoclet-jboss-module-1.2.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xdoclet-jmx-module-1.2.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xdoclet-web-module-1.2.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xjavadoc-1.5-snapshot050611.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list