portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/build build.xml
Date Mon, 03 Jun 2002 01:25:40 GMT
paulsp      2002/06/02 18:25:40

  Modified:    build    Tag: security_14 build.xml
  Log:
  o Add template for JetspeedSecurity.properties
  o Add default values for JetspeedSecurity.properties
  o By using tempate and default files, build can change property
    values for testing.  This is currently implemented in the unit testing
    of PortalAccessController implementations
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.142.2.5 +56 -7     jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.142.2.4
  retrieving revision 1.142.2.5
  diff -u -r1.142.2.4 -r1.142.2.5
  --- build.xml	30 May 2002 07:04:09 -0000	1.142.2.4
  +++ build.xml	3 Jun 2002 01:25:40 -0000	1.142.2.5
  @@ -90,7 +90,7 @@
       <property name="ant.home" value="build"/>
       <property name="debug" value="on"/>
       <property name="optimize" value="off"/>
  -    <property name="deprecation" value="off"/>  
  +    <property name="deprecation" value="on"/>  
   
       <!-- Anakia doc settings -->
   
  @@ -820,14 +820,13 @@
               <test name="org.apache.jetspeed.services.registry.TestRegistryCategories"/>
   
   <!--				
  -           <test name="org.apache.jetspeed.services.registry.TestRegistryPersistence"/>

  +            <test name="org.apache.jetspeed.services.registry.TestRegistryPersistence"/>

   -->
  -
  -           <test name="org.apache.jetspeed.util.template.TestJetspeedLinkFactory"/>

  -           <test name="org.apache.jetspeed.util.rewriter.FrameRewriterTest"/> 
  -			  <test name="org.apache.jetspeed.services.profiler.TestProfilerService"/> 
  +            <test name="org.apache.jetspeed.util.template.TestJetspeedLinkFactory"/>

  +            <test name="org.apache.jetspeed.util.rewriter.FrameRewriterTest"/> 
  +            <test name="org.apache.jetspeed.services.profiler.TestProfilerService"/>

   <!--
  -			  <test name="org.apache.jetspeed.services.security.TestPortalAuthentication"/>
  +            <test name="org.apache.jetspeed.services.security.TestPortalAuthentication"/>
   -->
   
           </junit>
  @@ -860,9 +859,51 @@
       <!-- =================================================================== -->
       <!-- Run the client JUnit test cases (non-cactus)                        -->
       <!-- =================================================================== -->
  +    <target name="unittest-security" depends="unittest-security-turbine"
  +            description="Security unit test for all implementations"/>
  +
  +    <!-- =================================================================== -->
  +    <!-- Run the client JUnit test cases (non-cactus)                        -->
  +    <!-- =================================================================== -->
  +    <target name="unittest-security-registry" depends="compile"
  +            description="Registry security unit test">
  +
  +        <copy file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.template" tofile="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.properties"
overwrite="yes">
  +          <filterset>
  +            <filtersfile file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.default"/>
  +            <filter token="services.PortalAccessController.classname" value="org.apache.jetspeed.services.security.registry.RegistryAccessController"/>
  +          </filterset>
  +        </copy>
  +
  +        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
  +            <classpath>
  +                <pathelement location="${build.dest.dir}"/>
  +                <path refid="classpath"/>
  +                <pathelement location="${junit.jar}"/>
  +                <pathelement location="${hsql.jar}"/>
  +            </classpath>
  +
  +            <formatter type="plain" usefile="false"/>            
  +
  +            <!-- JUnit unit tests -->
  +            <test name="org.apache.jetspeed.services.security.registry.TestAccessController"/>
  +
  +        </junit>
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Run the client JUnit test cases (non-cactus)                        -->
  +    <!-- =================================================================== -->
       <target name="unittest-security-turbine" depends="compile"
               description="Turbine security unit test">
   
  +        <copy file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.template" tofile="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.properties"
overwrite="yes">
  +          <filterset>
  +            <filtersfile file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.default"/>
  +            <filter token="services.PortalAccessController.classname" value="org.apache.jetspeed.services.security.turbine.TurbineAccessController"/>
  +          </filterset>
  +        </copy>
  +
           <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
   
               <classpath>
  @@ -880,6 +921,7 @@
           </junit>
       </target>
   
  +
       <!-- =================================================================== -->
       <!-- Rebuilds everything                                                 -->
       <!-- This is a little quicker than "clean; build" because there is no    -->
  @@ -905,6 +947,13 @@
               <include name="**.java"/>
           </fileset>
           </delete>
  +
  +        <!-- Set JetspeedSecurity propery file to it's default values -->
  +        <copy file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.template" tofile="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.properties"
overwrite="yes">
  +          <filterset>
  +            <filtersfile file="${webapp.dir}/WEB-INF/conf/JetspeedSecurity.default"/>
  +          </filterset>
  +        </copy>
       </target>
   
   	 <!-- =================================================================== -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message