[jboss-cvs] jbosstest build.xml

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 04/04/25 20:00:15

  Modified:    .        Tag: Branch_3_2 build.xml
  Log:
  Factor out the clustered http ejbs into a seperate hello-ha.jar
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.165.2.150 +38 -5     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.165.2.149
  retrieving revision 1.165.2.150
  diff -u -r1.165.2.149 -r1.165.2.150
  --- build.xml	14 Apr 2004 17:04:10 -0000	1.165.2.149
  +++ build.xml	26 Apr 2004 03:00:12 -0000	1.165.2.150
  @@ -15,7 +15,7 @@
   <!--                                                              -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.165.2.149 2004/04/14 17:04:10 ejort Exp $ -->
  +<!-- $Id: build.xml,v 1.165.2.150 2004/04/26 03:00:12 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -989,6 +989,7 @@
         <fileset dir="${source.java}">
           <include name="org/jboss/test/webservice/arrays/ArraysData.java"/>
           <include name="org/jboss/test/webservice/arrays/server/ArraysBean.java"/>
  +        <include name="org/jboss/test/webservice/arrays/server/ArraysBean2.java"/>
         </fileset>
         <entitycmp cmpspec="2.x"/>
         <remoteinterface/>
  @@ -1607,8 +1608,25 @@
       </jar>
   
       <!-- build hello.jar -->
  -    <jar jarfile="${build.lib}/hello.jar">
  -      <metainf dir="${build.resources}/hello/META-INF" />
  +    <jar destfile="${build.lib}/hello.jar">
  +      <metainf dir="${build.resources}/hello/META-INF">
  +         <include name="ejb-jar.xml" />
  +         <include name="jboss.xml" />
  +         <include name="jbosscmp-jdbc.xml" />
  +      </metainf>
  +      <fileset dir="${build.classes}">
  +        <patternset refid="jboss.test.util.ejb.set"/>
  +        <include name="org/jboss/test/hello/interfaces/**"/>
  +        <include name="org/jboss/test/hello/ejb/**"/>
  +      </fileset>
  +    </jar>
  +
  +    <!-- build hello-ha.jar -->
  +    <jar destfile="${build.lib}/hello-ha.jar">
  +      <zipfileset dir="${build.resources}/hello/META-INF"
  +         includes="ejb-jar-ha.xml" fullpath="META-INF/ejb-jar.xml" />
  +      <zipfileset dir="${build.resources}/hello/META-INF"
  +         includes="jboss-ha.xml" fullpath="META-INF/jboss.xml" />
         <fileset dir="${build.classes}">
           <patternset refid="jboss.test.util.ejb.set"/>
           <include name="org/jboss/test/hello/interfaces/**"/>
  @@ -3291,7 +3309,7 @@
       </war>
   -->
       <!-- war to test FORM auth -->
  -    <war warfile="${build.lib}/form-auth.war"
  +    <war destfile="${build.lib}/form-auth.war"
         webxml="${build.resources}/web/WEB-INF/form-auth-web.xml">
         <webinf dir="${build.resources}/web/html/other/WEB-INF">
           <include name="jboss-web.xml"/>
  @@ -3299,10 +3317,22 @@
         <classes dir="${build.classes}">
            <include name="org/jboss/test/web/servlets/SecureServlet.class" />
         </classes>
  -      <fileset dir="${build.resources}/web/html/root">
  +      <fileset dir="${build.resources}/web/html/other">
           <include name="**/*.html"/>
         </fileset>
       </war>
  +<!--
  +    <ear destfile="${build.lib}/form-auth.ear">
  +      appxml="${build.resources}/web/META-INF/application.xml">
  +      <metainf dir="${build.resources}/web/META-INF">
  +        <include name="jboss-app.xml" />
  +      </metainf>
  +      <fileset dir="${build.lib}">
  +        <include name="form-auth.war"/>
  +        <include name="web-sec.sar"/>
  +      </fileset>
  +    </ear>
  +-->
   
       <!-- war to test CLIENT-CERT auth -->
       <war warfile="${build.lib}/clientcert-auth.war"
  @@ -5864,6 +5894,9 @@
         <sysproperty key="jbosstest.secure" value="true"/>
         <sysproperty key="java.security.auth.login.config"
           value="${build.resources}/security/auth.conf"/>
  +      <sysproperty key="javax.net.ssl.trustStore"
  +        value="${build.resources}/security/tst.keystore"/>
  +      <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true" />
   
         <classpath>
           <pathelement location="${build.classes}"/>