[Bprocessor-commit] model .classpath,1.6,1.7 build.xml,1.10,1.11

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26705

Modified Files:
	.classpath build.xml 
Log Message:
Simplified building

Index: .classpath
===================================================================
RCS file: /cvsroot/bprocessor/model/.classpath,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .classpath	24 Jan 2006 13:57:35 -0000	1.6
--- .classpath	23 Mar 2006 12:24:02 -0000	1.7
***************
*** 3,9 ****
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- 	<classpathentry kind="lib" path="build/code"/>
  	<classpathentry exported="true" kind="lib" path="/tools/log4j/log4j.jar"/>
  	<classpathentry exported="true" kind="lib" path="/tools/jaxb/jaxb.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 3,9 ----
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry exported="true" kind="lib" path="/tools/log4j/log4j.jar"/>
  	<classpathentry exported="true" kind="lib" path="/tools/jaxb/jaxb.jar"/>
+ 	<classpathentry kind="lib" path="build"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/model/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml	5 Dec 2005 20:59:44 -0000	1.10
--- build.xml	23 Mar 2006 12:24:02 -0000	1.11
***************
*** 8,13 ****
  
      <property name="build.dir" value="${basedir}/build"/>
-     <property name="build.test.dir" value="${basedir}/build/test"/>
-     <property name="build.code.dir" value="${basedir}/build/code"/>
      <property name="src.dir" value="${basedir}/src"/>
      <property name="conf.dir" value="${src.dir}/etc"/>
--- 8,11 ----
***************
*** 16,20 ****
      <property name="lib.dir" value="${basedir}/lib"/>
      <property name="dist.dir" value="${basedir}/dist"/>
-     <property name="test.dir" value="${basedir}/test"/>
      <property name="test.doc.api.dir" value="${doc.dir}/testapi"/>
  
--- 14,17 ----
***************
*** 48,52 ****
      <echo message=""/>
      <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.code.dir}"/>
    </target>
  
--- 45,49 ----
      <echo message=""/>
      <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.dir}"/>
    </target>
  
***************
*** 78,86 ****
      </taskdef>
      <xjc schema="${conf.dir}/bprocessor.xsd"
!          target="${build.code.dir}"
           package="net.sourceforge.bprocessor.model.xml">
        <arg value="-nv"/>
      </xjc>
!     <javac srcdir="${build.code.dir}" destdir="${build.code.dir}" deprecation="yes"
             debug="yes"     
             includes="net/**">
--- 75,83 ----
      </taskdef>
      <xjc schema="${conf.dir}/bprocessor.xsd"
!          target="${build.dir}"
           package="net.sourceforge.bprocessor.model.xml">
        <arg value="-nv"/>
      </xjc>
!     <javac srcdir="${build.dir}" destdir="${build.dir}" deprecation="yes"
             debug="yes"     
             includes="net/**">
***************
*** 90,94 ****
      </javac>
      <delete>
!       <fileset dir="${build.code.dir}">
          <include name="**/*.java"/>
        </fileset>
--- 87,91 ----
      </javac>
      <delete>
!       <fileset dir="${build.dir}">
          <include name="**/*.java"/>
        </fileset>
***************
*** 107,112 ****
        <fileset dir="${src.dir}"
                 includes="**/*.java"/>
-       <fileset dir="${test.dir}"
-                includes="**/*.java"/>
      </checkstyle>
    </target>
--- 104,107 ----
***************
*** 130,134 ****
    <target name="jar" depends="init"> 
      <mkdir dir="${dist.dir}"/>
!     <copy todir="${build.code.dir}">
        <fileset dir="${conf.dir}">
          <include name="**/*.properties"/>
--- 125,129 ----
    <target name="jar" depends="init"> 
      <mkdir dir="${dist.dir}"/>
!     <copy todir="${build.dir}">
        <fileset dir="${conf.dir}">
          <include name="**/*.properties"/>
***************
*** 136,140 ****
      </copy>
      <jar jarfile="${dist.dir}/${name}.jar"
!          basedir="${build.code.dir}"
           compress="true"
           includes="**/*"
--- 131,135 ----
      </copy>
      <jar jarfile="${dist.dir}/${name}.jar"
!          basedir="${build.dir}"
           compress="true"
           includes="**/*"
***************
*** 182,209 ****
      <ant dir="test" target="doc"/>
    </target>
- 
-   <target name="test" depends="dist">
-     <ant dir="test" target="compile"/>
- 
-     <junit>
-       <classpath>
-         <fileset dir="${lib.dir}">
-           <include name="**/*.jar"/>
-         </fileset>
-         <fileset dir="${dist.dir}">
-           <include name="**/*.jar"/>
-         </fileset>
-         <pathelement location="${build.test.dir}"/>
-       </classpath>
- 
-       <formatter type="plain"/>
-       <batchtest fork="yes" todir="${basedir}">
-         <fileset dir="${test.dir}">
-           <include name="**/*Test*.java"/>
-           <exclude name="**/AllTests.java"/>
-         </fileset>
-       </batchtest>
- 
-     </junit>
-   </target>
  </project>
--- 177,179 ----