[jboss-cvs] jboss-ejb3 ...

[Carlo de Wolf]

  User: wolfc   
  Date: 06/07/28 04:04:34

  Modified:    jboss-ejb3    build.xml .classpath build-test.xml
  Log:
  EJBTHREE-667: work in progress
  
  Revision  Changes    Path
  1.88      +2 -0      jboss-ejb3/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/build.xml,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -b -r1.87 -r1.88
  --- build.xml	24 Jul 2006 21:28:29 -0000	1.87
  +++ build.xml	28 Jul 2006 08:04:34 -0000	1.88
  @@ -14,7 +14,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.87 2006/07/24 21:28:29 bdecoste Exp $ -->
  +<!-- $Id: build.xml,v 1.88 2006/07/28 08:04:34 wolfc Exp $ -->
   
   <project default="main" name="JBoss/EJB3">
   
  @@ -97,6 +97,7 @@
            <path refid="jboss.microcontainer.classpath"/>
            <path refid="quartz.quartz.classpath"/>
            <path refid="jboss.jbossxb.classpath"/>
  +         <path refid="jacorb.jacorb.classpath"/>
   
            <!-- FIXME: temporary for EJBTHREE-485 -->
            <path refid="cglib.classpath"/>
  @@ -125,6 +126,7 @@
            <path refid="jboss.server.classpath"/>
            <path refid="jboss.messaging.classpath"/>
            <path refid="jboss.jca.classpath"/>
  +         <path refid="jboss.iiop.classpath"/>
         </path>
   
         <!-- ===== -->
  
  
  
  1.26      +2 -0      jboss-ejb3/.classpath
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: .classpath
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/.classpath,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- .classpath	23 Jun 2006 10:44:34 -0000	1.25
  +++ .classpath	28 Jul 2006 08:04:34 -0000	1.26
  @@ -88,5 +88,7 @@
   	<classpathentry kind="lib" path="/thirdparty/cglib/lib/cglib.jar"/>
   	<classpathentry combineaccessrules="false" kind="src" path="/connector"/>
   	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
  +	<classpathentry combineaccessrules="false" kind="src" path="/iiop"/>
  +	<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
   	<classpathentry kind="output" path="output/eclipse-classes"/>
   </classpath>
  
  
  
  1.220     +31 -1     jboss-ejb3/build-test.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build-test.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/build-test.xml,v
  retrieving revision 1.219
  retrieving revision 1.220
  diff -u -b -r1.219 -r1.220
  --- build-test.xml	24 Jul 2006 21:28:29 -0000	1.219
  +++ build-test.xml	28 Jul 2006 08:04:34 -0000	1.220
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build-test.xml,v 1.219 2006/07/24 21:28:29 bdecoste Exp $ -->
  +<!-- $Id: build-test.xml,v 1.220 2006/07/28 08:04:34 wolfc Exp $ -->
   
   
   <project default="main" name="JBoss/EJB3 Tests">
  @@ -2162,6 +2162,19 @@
         </jar>
      </target>
   
  +   <target name="iiop"
  +      description="Builds all jar files."
  +      depends="compile-classes">
  +
  +      <mkdir dir="${build.lib}"/>
  +
  +      <jar jarfile="${build.lib}/iiop.jar">
  +         <fileset dir="${build.classes}">
  +            <include name="org/jboss/ejb3/test/iiop/*.class"/>
  +         </fileset>
  +      </jar>
  +   </target>
  +
      <target name="security"
         description="Builds all jar files."
         depends="compile-classes">
  @@ -2560,6 +2573,10 @@
               <path refid="jboss.common.classpath"/>
               <path refid="jboss.aop50.classpath"/>
               <path refid="jboss.aspects.classpath"/>
  +         	<!-- for Corba -->
  +         	<path refid="jacorb.jacorb.classpath"/>
  +         	<path refid="apache.avalon.classpath"/>
  +         	<path refid="apache.avalon.logkit.classpath"/>
   
               <!-- EJBTHREE-485 needs javassist -->
               <path refid="javassist.classpath"/>
  @@ -3453,4 +3470,17 @@
         <delete dir="${build.reports}"/>
      </target>
   
  +   <target name="test-iiop" depends="init" if="test"
  +      description="Execute all tests in the given test directory.">
  +      <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
  +      <antcall target="test-with-jvmargs" inheritRefs="true">
  +         <param name="test" value="${test}"/>
  +      	 <!-- using jacorb -->
  +         <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
  +         <!-- using sun jdk
  +         <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
  +      	 -->
  +      </antcall>
  +   </target>
  +
   </project>