[jboss-cvs] JBossAS SVN: r70246 - in trunk/ejb3: src/main/org/jboss and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-02-29 00:35:04 -0500 (Fri, 29 Feb 2008)
New Revision: 70246

Removed:
   trunk/ejb3/src/main/org/jboss/ejb/
Modified:
   trunk/ejb3/.classpath
   trunk/ejb3/build.xml
Log:
Restore the client enc injector code as part of the ejb3.deployer

Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath	2008-02-29 05:33:21 UTC (rev 70245)
+++ trunk/ejb3/.classpath	2008-02-29 05:35:04 UTC (rev 70246)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="org/jboss/ejb3/deployers/**" kind="src" path="src/main"/>
+	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>

Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2008-02-29 05:33:21 UTC (rev 70245)
+++ trunk/ejb3/build.xml	2008-02-29 05:35:04 UTC (rev 70246)
@@ -149,9 +149,6 @@
          <path refid="jboss.jboss.security.spi.classpath"/>
          <path refid="jboss.security.int.classpath"/>
          <path refid="jboss.server.classpath"/>
-         <path refid="jboss.mq.classpath"/>
-         <path refid="jboss.jca.classpath"/>
-         <path refid="jboss.iiop.classpath"/>
       </path>
 
       <!-- ===== -->
@@ -181,9 +178,6 @@
          <path refid="dependentmodule.classpath"/>
       </path>
 
-      <!-- This module is based on Java 1.2 -->
-      <property name="javac.target" value="1.2"/>
-
       <!-- classpath and local.classpath must have a value using with a path -->
       <property name="classpath" value=""/>
       <property name="local.classpath" value=""/>
@@ -255,7 +249,7 @@
          failonerror="${javac.fail.onerror}">
          <src path="${source.java}"/>
          <classpath refid="javac.classpath"/>
-         <include name="org/jboss/ejb3/deployers/**"/>
+         <include name="${javac.includes}"/>
          <exclude name="${javac.excludes}"/>
       </javac>
    </target>
@@ -299,6 +293,7 @@
       <jar jarfile="${build.lib}/jboss-ejb3-deployer.jar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/deployers/**"/>
+            <include name="org/jboss/ejb3/clientmodule/*"/>
          </fileset>
       </jar>
 
@@ -321,80 +316,6 @@
   
   
    <!-- ================================================================== -->
-   <!-- Install & Release                                                  -->
-   <!-- ================================================================== -->
-
-   <target name="install"
-      description="Install the structure for a release."
-      depends="all, _buildmagic:install:default"/>
-
-   <target name="release" depends="install"/>
-
-   <target name="release-zip"
-      description="Builds a ZIP distribution."
-      depends="release, _buildmagic:release:zip"/>
-
-   <target name="release-tar"
-      description="Builds a TAR distribution."
-      depends="release, _buildmagic:release:tar"/>
-
-   <target name="release-tgz"
-      description="Builds a TAR-GZ distribution."
-      depends="release, _buildmagic:release:tgz"/>
-
-   <target name="release-all"
-      description="Builds a distribution for each archive type."
-      depends="release-zip, release-tgz"/>
-
-   <target name="dist" depends="init">
-      <unjar src="${jboss.aspects.lib}/jboss-aop-jdk50.deployer"
-         dest="${build.lib}/jboss-aop-jdk50.deployer" />
-        <javadoc
-        	packagenames="org.jboss.annotation"
-        	classpathref="javac.classpath"
-        	destdir="output/api"
-        	use="true"
-        	protected="true"
-        	version="true"
-        	windowtitle="JBoss EJB 3.0 API Documentation"
-        	doctitle="JBoss EJB 3.0 API Documentation">
-          <fileset dir="${source.java}" defaultexcludes="yes">
-             <include name="org/jboss/annotation/**"/>
-             <exclude name="org/jboss/annotation/**/*Impl*"/>
-          </fileset>
-        </javadoc>
-      <property name="ejb3.version" value="jboss-EJB-3.0_RC2"/>
-      <zip zipfile="${ejb3.version}.zip">
-         <zipfileset dir="." prefix="${ejb3.version}">
-            <include name="INSTALL.html"/>
-            <include name="RELEASE_NOTES.txt"/>
-         </zipfileset>
-         <zipfileset dir="output/api" prefix="${ejb3.version}/docs/api">
-             <include name="**"/>
-         </zipfileset>
-         <zipfileset dir="${jboss.jbossxb.lib}" prefix="${ejb3.version}/lib">
-            <include name="jboss-xb.jar"/>
-         </zipfileset>
-         <zipfileset dir="${build.lib}" prefix="${ejb3.version}/lib">
-            <include name="jboss-aop-jdk50.deployer/**"/>
-            <include name="ejb3.deployer/**"/>
-            <include name="ejb3-interceptors-aop.xml"/>
-            <include name="ejb3-clustered-sfsbcache-beans.xml"/>
-            <include name="ejb3-entity-cache-beans.xml"/>
-            <include name="ejb3-timer-service.xml"/>
-         </zipfileset>
-         <zipfileset dir="docs" prefix="${ejb3.version}/docs">
-            <include name="**"/>
-            <exclude name="**/CVS/**"/>
-            <exclude name="**/*.wiki"/>
-            <exclude name="docs/embedded*/**"/>
-            <exclude name="docs/reference/build.xml"/>
-            <exclude name="docs/reference/reference/**"/>
-         </zipfileset>
-      </zip>
-   </target>
-
-   <!-- ================================================================== -->
    <!-- Cleaning                                                           -->
    <!-- ================================================================== -->