[jboss-cvs] CacheBenchFwk ...

[Manik Surtani]

  User: msurtani
  Date: 07/05/16 12:59:09

  Modified:    CacheBenchFwk  build.xml
  Log:
  Cfg
  
  Revision  Changes    Path
  1.2       +116 -9    CacheBenchFwk/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/CacheBenchFwk/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- build.xml	10 May 2007 22:26:21 -0000	1.1
  +++ build.xml	16 May 2007 16:59:08 -0000	1.2
  @@ -204,6 +204,72 @@
     </target>
     
     
  +     <!-- Module terracotta230-plugin -->
  +
  +  <dirname property="module.terracotta-plugin.basedir" file="${ant.file}"/>
  +
  +
  +
  +  <property name="compiler.args.terracotta-plugin" value="${compiler.args}"/>
  +
  +  <property name="terracotta-plugin.output.dir" value="${module.terracotta-plugin.basedir}/classes/production/terracotta230-plugin"/>
  +  <property name="terracotta-plugin.testoutput.dir" value="${module.terracotta-plugin.basedir}/classes/test/terracotta230-plugin"/>
  +
  +  <path id="terracotta-plugin.module.bootclasspath">
  +    <!-- Paths to be included in compilation bootclasspath -->
  +  </path>
  +
  +  <path id="terracotta-plugin.module.classpath">
  +    <pathelement location="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.3.0/conf"/>
  +    <pathelement location="${framework.output.dir}"/>
  +    <pathelement location="${framework.testoutput.dir}"/>
  +    <fileset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.3.0/lib" includes="*.jar" />
  +  </path>
  +
  +
  +  <patternset id="excluded.from.module.terracotta-plugin">
  +    <patternset refid="ignored.files"/>
  +  </patternset>
  +
  +  <patternset id="excluded.from.compilation.terracotta-plugin">
  +    <patternset refid="excluded.from.module.terracotta-plugin"/>
  +  </patternset>
  +
  +  <path id="terracotta-plugin.module.sourcepath">
  +    <dirset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.3.0">
  +      <include name="src"/>
  +    </dirset>
  +  </path>
  +
  +
  +  <target name="compile.module.terracotta-plugin" depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests" description="Compile module terracotta230-plugin"/>
  +
  +  <target name="compile.module.terracotta-plugin.production" depends="compile.module.framework" description="Compile module terracotta230-plugin; production classes">
  +    <mkdir dir="${terracotta-plugin.output.dir}"/>
  +    <javac destdir="${terracotta-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
  +      <compilerarg line="${compiler.args.terracotta-plugin}"/>
  +      <bootclasspath refid="terracotta-plugin.module.bootclasspath"/>
  +      <classpath refid="terracotta-plugin.module.classpath"/>
  +      <src refid="terracotta-plugin.module.sourcepath"/>
  +      <patternset refid="excluded.from.compilation.terracotta-plugin"/>
  +    </javac>
  +
  +    <copy todir="${terracotta-plugin.output.dir}">
  +      <fileset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.3.0/src">
  +        <patternset refid="compiler.resources"/>
  +        <type type="file"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="compile.module.terracotta-plugin.tests" depends="compile.module.terracotta-plugin.production" description="compile module terracotta230-plugin; test classes" unless="skip.tests"/>
  +
  +  <target name="clean.module.terracotta-plugin" description="cleanup module">
  +    <delete dir="${terracotta-plugin.output.dir}"/>
  +    <delete dir="${terracotta-plugin.testoutput.dir}"/>
  +  </target>
  +
  +
     <!-- Module JBossCache140-plugin -->
     
     <dirname property="module.jbosscache140-plugin.basedir" file="${ant.file}"/>
  @@ -371,19 +437,60 @@
     
     <target name="all" depends="init, clean, compile.module.framework, compile.module.ehcache124-plugin, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin" description="build all"/>
   
  -  <target name="runMaster">
  -     <java classname="org.cachebench.CacheBenchMarker" fork="${jvm.fork}" maxmemory="${jvm.maxmem}">
  +  <target name="run">
  +     <!-- the classpaths here are a bit arse - you need to MANUALLY specify which plugins to add to the classpath
  +     to prevent JBoss Cache 1.x and 2.x tripping over each other. -->
  +
  +     <!-- Formats: expects system properties
  +         org.cachebench.plugins.jbosscache1
  +         org.cachebench.plugins.jbosscache2
  +         org.cachebench.pluins.ehcache
  +         org.cachebench.plugins.terracotta
  +         to be set to true if they need to be added to the classpath of the test.  -->
  +
  +     <echo>Running class ${runtime.classname}</echo>
  +     <java classname="${runtime.classname}" fork="${jvm.fork}" maxmemory="${jvm.maxmem}">
           <sysproperty key="bind.address" value="${bind.address}" />
           <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
  -        <classpath id="" />
  +        <classpath refid="framework.module.classpath" />
  +        <classpath location="${framework.output.dir}" />
  +
  +        <!-- how can we add these *optionally*?  :S -->
  +
  +        <!-- JBoss Cache 1.x plugin -->
  +        <classpath refid="jbosscache140-plugin.module.classpath"/>
  +        <classpath location="${jbosscache140-plugin.output.dir}"/>
  +
  +        <!-- JBoss Cache 2.x plugin -->
  +        <!--<classpath refid="jbosscache200-plugin.module.classpath"/>-->
  +        <!--<classpath location="${jbosscache200-plugin.output.dir}"/>-->
  +
  +        <!-- EHCache 1.2.x plugin -->
  +        <!--<classpath refid="ehcache124-plugin.module.classpath"/>-->
  +        <!--<classpath location="${ehcache124-plugin.output.dir}"/>-->
  +
  +        <!-- Terracotta 2.3.x plugin -->
  +        <!--<classpath refid="terracotta-plugin.module.classpath"/>-->
  +        <!--<classpath location="${terracotta-plugin.output.dir}"/>-->
  +
           
        </java>
     </target>
   
  +   <target name="addToCP" if="jbc">
  +
  +   </target>
  +
     <target name="runSlave">
  -     <java classname="org.cachebench.CacheBenchMarkerSlave" fork="${jvm.fork}" maxmemory="${jvm.maxmem}">
  -        <sysproperty key="bind.address" value="${bind.address}" />
  -        <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
  -     </java>
  +     <antcall target="run">
  +        <param name="runtime.classname" value="org.cachebench.CacheBenchMarkerSlave" />
  +     </antcall>
  +  </target>
  +
  +  <target name="runMaster">
  +     <antcall target="run">
  +        <param name="runtime.classname" value="org.cachebench.CacheBenchMarker" />
  +     </antcall>
     </target>
  +   
   </project>
  \ No newline at end of file