xlawrence    2005/05/19 12:54:50 CEST

  Modified files:
    .                    maven.xml project.xml 
  Log:
  Updated to support JUnit testing
  
  Revision  Changes    Path
  1.26      +35 -3     uwcal_JSR168/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/maven.xml.diff?r1=1.25&r2=1.26&f=h
  1.12      +12 -2     uwcal_JSR168/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.xml.diff?r1=1.11&r2=1.12&f=h
  
  
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/repository/uwcal_JSR168/maven.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- maven.xml 17 May 2005 14:12:20 -0000      1.25
  +++ maven.xml 19 May 2005 10:54:50 -0000      1.26
  @@ -40,7 +40,7 @@
         />
     </goal>
   
  -  <goal name="synchClient" description="Launches the iCalendar sync client">
  +  <goal name="syncClient" description="Launches the iCalendar sync client">
         <maven:reactor
           basedir="${basedir}"
           includes="syncClient/project.xml"
  @@ -168,6 +168,38 @@
        excludes="settings.properties"/>
       </delete>
     </preGoal>
  -
  -
  +  
  +  <goal name="RMI.sender.test">
  +    <attainGoal name="jar:jar" />
  +    <rmic 
classname="org.jahia.suite.calendar.framework.rmi.RMITransportSender.SyncServerImpl"
 base="${maven.build.dest}"/>
  +    <copy file="${basedir}/src/conf/java/log4j.xml" 
todir="${maven.build.dest}" />
  +    <java 
classname="org.jahia.suite.calendar.framework.rmi.RMITransportSenderTest"
  +          fork="yes">
  +          <classpath>
  +            <path refid="maven.dependency.classpath"/>
  +            <pathelement path="${maven.build.dest}"/>
  +            <pathelement path="${maven.build.dir}/test-classes"/>
  +          </classpath>
  +          <jvmarg 
value="-Djava.rmi.server.codebase=file:/${maven.build.dest}"/>
  +          <jvmarg 
value="-Djava.security.policy=${maven.build.dest}/java.policy"/>
  +          <!-- 'true' to test sendAndGetResponse (synchronous call) -->
  +          <arg value="true"/>
  +    </java>
  +  </goal>
  +  
  +  <goal name="RMI.receiver.test">
  +    <attainGoal name="jar:jar" />
  +    <rmic 
classname="org.jahia.suite.calendar.framework.rmi.RMITransportReceiver.CalServerImpl"
 base="${maven.build.dest}"/>
  +    <copy file="${basedir}/src/conf/java/log4j.xml" 
todir="${maven.build.dest}" />
  +    <java 
classname="org.jahia.suite.calendar.framework.rmi.RMITransportReceiverTest"
  +          fork="yes">
  +          <classpath>
  +            <path refid="maven.dependency.classpath"/>
  +            <pathelement path="${maven.build.dest}"/>
  +            <pathelement path="${maven.build.dir}/test-classes"/>
  +          </classpath>
  +          <jvmarg 
value="-Djava.rmi.server.codebase=file:/${maven.build.dest}"/>
  +          <jvmarg 
value="-Djava.security.policy=${maven.build.dest}/java.policy"/>
  +    </java>
  +  </goal>
   </project>
  \ No newline at end of file
  
  
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/repository/uwcal_JSR168/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml       9 May 2005 12:51:04 -0000       1.11
  +++ project.xml       19 May 2005 10:54:50 -0000      1.12
  @@ -97,11 +97,21 @@
   
     <build>
       <sourceDirectory>src/java</sourceDirectory>
  +    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
  +    <unitTest>
  +      <includes>
  +        <include>**/*Test.java</include>
  +      </includes>
  +      <excludes>
  +        <exclude>**/RMI*.java</exclude> <!-- Not JUnit tests ! -->
  +        <exclude>**/JMS*.java</exclude> <!-- Not JUnit tests ! -->
  +      </excludes>
  +    </unitTest>
       <resources>
         <resource>
  -        <directory>src/java</directory>
  +        <directory>src/conf/java</directory>
           <includes>
  -          <include>*.properties</include>
  +          <include>**/*</include>
           </includes>
         </resource>
       </resources>
  

Reply via email to