Index: D:/SHAM/workspace_jboss/ejb3/build.xml
===================================================================
--- D:/SHAM/workspace_jboss/ejb3/build.xml	(revision 64459)
+++ D:/SHAM/workspace_jboss/ejb3/build.xml	(working copy)
@@ -161,6 +161,18 @@
       <property name="install.id" value="${module.name}-${module.version}"/>
       <property name="release.id" value="${install.id}"/>
       <property name="install.root" value="${module.output}/${install.id}"/>
+      
+    <!-- ============================= -->
+    <!-- Paths etc. for the retro task -->
+    <!-- ============================= -->
+    <property name="build.classes.retro" value="${module.output}/classes-retro"/>
+    <property name="build.lib.retro" value="${module.output}/lib14"/>
+    <path id="jbossretro.classpath">
+      <path refid="apache.ant.classpath"/>
+      <path refid="jboss.jbossretro.classpath"/>
+      <path refid="jboss.backport.concurrent.classpath"/>
+      <path refid="javassist.classpath"/>
+    </path>
 
       <!-- The combined thirdparty classpath -->
       <path id="thirdparty.classpath">
@@ -224,7 +236,7 @@
 
    <target name="compile"
       description="Compile all source files."
-      depends="compile-etc, compile-classes"/>
+      depends="compile-etc, compile-classes, retro"/>
 
    <!-- Compile all class files -->
    <target name="compile-classes" depends="init">
@@ -247,6 +259,21 @@
       </javac>
    </target>
 
+  <!-- Run jbossretro on the classes -->
+  <target name="retro">
+    <mkdir dir="${build.lib.retro}"/>
+    <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+    <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
+      <classpath refid="jbossretro.classpath"/>
+      <classpath refid="library.classpath"/>
+      <classpath refid="dependentmodule.classpath"/>
+      <classpath>
+        <pathelement path="${build.classes}"/>
+      </classpath>
+      <src path="${build.classes}"/>
+    </retro>
+  </target>
+
    <!-- Compile manifests -->
    <target name="compile-etc" depends="init">
       <mkdir dir="${build.etc}"/>
@@ -361,6 +388,48 @@
          </fileset>
       </jar>
 
+   	
+     <!-- Create the jdk14 compatible jar from the retrod classes -->
+     <jar jarfile="${build.lib.retro}/jboss-ejb3-client14.jar" manifest="${build.etc}/default.mf">
+        <fileset dir="${build.classes.retro}">
+           <include name="org/jboss/ejb3/EJB3Util.class"/>
+	       <include name="org/jboss/ejb3/JndiUtil.class"/>
+           <include name="org/jboss/ejb3/Ejb3Registry.class"/>
+           <include name="org/jboss/ejb3/InitialContextFactory.class"/>
+           <include name="org/jboss/ejb3/asynchronous/*"/>
+           <include name="org/jboss/ejb3/interceptor/ClientInterceptorUtil.class"/>
+           <include name="org/jboss/ejb3/mdb/ConsumerManager.class"/>
+           <include name="org/jboss/ejb3/mdb/Producer*.class"/>
+           <include name="org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.*"/>
+           <include name="org/jboss/ejb3/remoting/IsLocalInterceptor.*"/>
+        	<include name="org/jboss/ejb3/remoting/IsLocalProxyFactoryInterceptor.*"/>
+           <include name="org/jboss/ejb3/stateful/ForwardId.class"/>
+           <include name="org/jboss/ejb3/stateful/StatefulRemoteInvocation.class"/>
+           <include name="org/jboss/ejb3/ProxyUtils.class"/>
+           <include name="org/jboss/ejb3/**/*Proxy.class"/>
+           <!--exclude name="org/jboss/ejb3/**/*LocalProxy.class"/-->
+           <include name="org/jboss/ejb3/**/*HandleImpl.class"/>
+           <include name="org/jboss/ejb3/Container.class"/>
+           <include name="org/jboss/ejb3/*ProxyFactory.class"/>
+           <include name="org/jboss/ejb3/proxy/**/*.class"/>
+           <include name="org/jboss/ejb3/*ServiceServer*.class"/>
+           <include name="org/jboss/ejb3/*KernelAbstraction*.class"/>
+           <include name="org/jboss/ejb3/statistics/*.class"/>
+           
+           <!-- EJBTHREE-485: include java assist proxy stuff -->
+           <include name="org/jboss/ejb3/stateless/Javassist*.class"/>
+           
+           <!-- EJBTHREE-667: include object factory -->
+           <include name="org/jboss/ejb3/naming/client/**/*.class"/>
+           <include name="org/jboss/ejb3/naming/BrainlessContext.class"/>
+
+        	<!-- EJBTHREE-718: client container -->
+        	<include name="org/jboss/ejb3/client/**/*.class"/>
+        	<include name="org/jboss/ejb3/metamodel/**/*.class"/>
+        	<include name="org/jboss/injection/**/*.class"/>
+        	<include name="org/jboss/ejb3/ThreadLocalENCFactory.class"/>
+        </fileset>
+     </jar>
       
       <!-- jboss-annotations-ejb3.jar -->
       <jar jarfile="${build.lib}/jboss-annotations-ejb3.jar" manifest="${build.etc}/default.mf">