You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/03/22 19:20:21 UTC

cvs commit: jakarta-jetspeed/build build.properties build.xml

taylor      02/03/22 10:20:21

  Modified:    build    build.properties build.xml
  Log:
    Log:
    o Add - unittest target for basic tests
    o Add - removed generation of castor-generated PSML
  
  Revision  Changes    Path
  1.10      +1 -1      jakarta-jetspeed/build/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.properties	20 Jan 2002 16:18:51 -0000	1.9
  +++ build.properties	22 Mar 2002 18:20:21 -0000	1.10
  @@ -17,7 +17,7 @@
   # resin.home.12=c:\resin-1.2.5
   # resin.home.13=c:\resin-1.3
   tomcat.home.32=d:/server/tomcat
  -tomcat.home.40=g:/server/catalina
  +tomcat.home.40=/apache/catalina
   # orion.home.14=c:\orion-1.4.5
   # weblogic.home.51=c:\weblogic-5.1
   #install.war=/apache/catalina/webapps
  
  
  
  1.127     +29 -27    jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- build.xml	4 Mar 2002 14:39:44 -0000	1.126
  +++ build.xml	22 Mar 2002 18:20:21 -0000	1.127
  @@ -386,26 +386,6 @@
           
       <target name="apis" depends="prepare_apis" unless="apis.uptodate">
           
  -        <!-- regen psml -->
  -      
  -        <delete quiet="true" >
  -        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup">
  -            <exclude name="CVS"/>
  -            <exclude name="package.html"/>
  -        </fileset>
  -        </delete>
  -
  -        <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
  -            <classpath refid="classpath"/>
  -            <arg value="-i" />
  -            <arg value="${src.xml.dir}/psml.xsd" />
  -            <arg value="-f" />
  -            <arg value="-dest" />
  -            <arg value="${src.java.dir}" />
  -            <arg value="-package" />
  -            <arg value="org.apache.jetspeed.xml.api.portletmarkup" />
  -          </java>
  -
           <!-- regen jcm -->
            
           <delete quiet="true" >
  @@ -649,10 +629,10 @@
   
               <formatter type="plain" usefile="false"/>            
   
  -            <!-- Cactus unit tests -->            
               <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
               <test name="org.apache.jetspeed.services.portletcache.TestTurbineCache"/>
   
  +
           </junit>
       </target>
   
  @@ -676,9 +656,10 @@
   
               <formatter type="plain" usefile="false"/>            
   
  -            <!-- Cactus unit tests -->            
  +            <!-- Cactus unit tests -->
               <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
               <test name="org.apache.jetspeed.services.portletcache.TestTurbineCache"/>
  +				
           </junit>
       </target>
   
  @@ -785,6 +766,32 @@
       </target>
   
       <!-- =================================================================== -->
  +    <!-- Run the client JUnit test cases (non-cactus)                        -->
  +    <!-- =================================================================== -->
  +    <target name="unittest">
  +
  +        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
  +
  +            <classpath>
  +                <pathelement location="${build.dest.dir}"/>
  +                <path refid="classpath"/>
  +                
  +                <pathelement location="${junit.jar}"/>
  +                <pathelement location="${cactus-23.jar}"/>                
  +
  +            </classpath>
  +
  +            <formatter type="plain" usefile="false"/>            
  +
  +            <!-- JUnit unit tests -->
  +				<test name="org.apache.jetspeed.services.psmlmanager.TestMarshalPsml"/>
  +				
  +        </junit>
  +    </target>
  +
  +
  +
  +    <!-- =================================================================== -->
       <!-- Rebuilds everything                                                 -->
       <!-- This is a little quicker than "clean; build" because there is no    -->
       <!-- second JVM bootup.                                                  -->
  @@ -802,11 +809,6 @@
           <fileset dir="${build.dir}">
               <!-- Everything in the build lib dir -->
               <exclude name="CVS"/>
  -        </fileset>
  -        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup">
  -            <exclude name="CVS"/>
  -            <exclude name="**.html"/>
  -            <include name="**.java"/>
           </fileset>
           <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm">
               <exclude name="CVS"/>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>