[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 04/03/15 21:34:49

  Modified:    .        build.xml
  Log:
  Update the _jars-security section
  
  Revision  Changes    Path
  1.350     +41 -25    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.349
  retrieving revision 1.350
  diff -u -r1.349 -r1.350
  --- build.xml	14 Mar 2004 18:37:59 -0000	1.349
  +++ build.xml	16 Mar 2004 05:34:48 -0000	1.350
  @@ -15,7 +15,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.349 2004/03/14 18:37:59 ejort Exp $ -->
  +<!-- $Id: build.xml,v 1.350 2004/03/16 05:34:48 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -3530,29 +3530,6 @@
     <target name="_jars-security">
       <mkdir dir="${build.lib}"/>
   
  -    <!-- build security-client.jar -->
  -    <jar jarfile="${build.lib}/security-client.jar"
  -	 manifest="${build.etc}/manifest.mf">
  -      <fileset dir="${build.classes}">
  -        <include name="org/jboss/test/security/interfaces/**"/>
  -      </fileset>
  -    </jar>
  -
  -    <!-- build security.jar -->
  -    <jar jarfile="${build.lib}/security.jar">
  -      <fileset dir="${build.classes}">
  -        <include name="org/jboss/test/security/interfaces/**"/>
  -        <include name="org/jboss/test/security/ejb/**"/>
  -        <include name="org/jboss/test/security/proxy/**"/>
  -        <include name="org/jboss/test/security/test/Namespace*"/>
  -        <include name="org/jboss/test/security/test/PermissionName*"/>
  -      </fileset>
  -      <fileset dir="${build.resources}/security">
  -        <include name="**/ejb-jar.xml" />
  -        <include name="**/jboss.xml" />
  -      </fileset>
  -    </jar>
  -
       <!-- build security-spec.jar -->
       <jar jarfile="${build.lib}/security-spec.sar">
         <metainf dir="${build.resources}/security-spec/service-inf" />
  @@ -3612,7 +3589,7 @@
   
       <!-- build https-service.sar -->
       <jar jarfile="${build.lib}/https-service.sar">
  -      <metainf dir="${build.resources}/security/META-INF"/>
  +      <metainf dir="${build.resources}/security/https-service"/>
         <metainf dir="${build.resources}/security">
           <include name="tst.keystore"/>
         </metainf>
  @@ -3653,6 +3630,45 @@
           <include name="org/jboss/test/securitymgr/test/**"/>
         </fileset>
       </jar>
  +
  +    <!-- build security-jaas.jar -->
  +    <jar jarfile="${build.lib}/security-jaas.sar">
  +      <metainf dir="${build.resources}/security/service-inf" />
  +    </jar>
  +    <war warfile="${build.lib}/security-jaas.war"
  +      webxml="${build.resources}/security/WEB-INF/jaas-web.xml" >
  +      <webinf dir="${build.resources}/security/WEB-INF">
  +         <include name="jboss-web.xml" />
  +      </webinf>
  +      <classes dir="${build.classes}">
  +        <include name="org/jboss/test/security/servlets/**"/>
  +      </classes>
  +    </war>
  +    <jar jarfile="${build.lib}/security-jaas.jar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/security/interfaces/CustomPrincipal*"/>
  +        <include name="org/jboss/test/security/ejb/CustomPrincipal*" />
  +      </fileset>
  +      <fileset dir="${build.resources}/security">
  +        <include name="META-INF/ejb-jar.xml" />
  +        <include name="META-INF/jboss.xml" />
  +      </fileset>
  +    </jar>
  +    <ear earfile="${build.lib}/security-jaas.ear"
  +       appxml="${build.resources}/security/META-INF/application-jaas.xml">
  +       <metainf dir="${build.resources}/security/META-INF">
  +         <include name="jboss-app.xml" />
  +       </metainf>
  +       <fileset dir="${build.lib}">
  +         <include name="security-jaas.jar" />
  +         <include name="security-jaas.sar" />
  +         <include name="security-jaas.war" />
  +       </fileset>
  +      <zipfileset dir="${build.resources}/security" prefix="security">
  +        <include name="roles.properties" />
  +        <include name="users.properties" />
  +      </zipfileset>
  +    </ear>
     </target>
   
      <!-- jsr77 test -->