avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-apps/enterprise/tools/util checkstyle.xml
Date Fri, 11 Apr 2003 00:44:29 GMT
donaldp     2003/04/10 17:44:29

  Modified:    enterprise/corbaloc build.xml
               enterprise/ins build.xml
               enterprise/orb build.xml
               enterprise/pss build.xml
               enterprise/time build.xml
               enterprise/tools/util checkstyle.xml
  Added:       enterprise/tools/lib avalon-framework-4.1.3.jar
                        logkit-1.1.jar
  Log:
  Decouple from commons dir
  
  Revision  Changes    Path
  1.6       +2 -4      avalon-apps/enterprise/corbaloc/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/corbaloc/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	11 Apr 2003 00:26:18 -0000	1.5
  +++ build.xml	11 Apr 2003 00:44:28 -0000	1.6
  @@ -3,12 +3,10 @@
   
     <property file="build.properties"/>
   
  -  <!-- common target wrappers -->
  -
     <property name="enterprise.path" value=".."/>
     <property name="apps.path" value="../.."/>
     <property name="orb.path" value="${enterprise.path}/orb"/>
  -  <property name="common.path" value="${apps.path}/common"/>
  +  <property name="tools.path" value="${enterprise.path}/tools"/>
   
     <target name="checkstyle">
       <ant antfile="${enterprise.path}/tools/util/checkstyle.xml">
  @@ -63,7 +61,7 @@
     <property name="idl.class"  value="org.openorb.compiler.IdlCompiler" />
   
     <path id="project.classpath">
  -      <fileset dir="${common.path}/lib">
  +      <fileset dir="${tools.path}/lib">
           <include name="logkit*.jar" />
           <include name="avalon-framework*.jar" />
         </fileset>
  
  
  
  1.11      +9 -14     avalon-apps/enterprise/ins/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/ins/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	20 Feb 2003 15:30:01 -0000	1.10
  +++ build.xml	11 Apr 2003 00:44:28 -0000	1.11
  @@ -4,10 +4,7 @@
     <property file="local.properties"/>
     <property file="build.properties"/>
   
  -  <!-- common target wrappers -->
  -
     <property name="enterprise.path" value=".."/>
  -  <property name="common.path" value="${enterprise.path}/../common"/>
     <property name="tools.path" value="${enterprise.path}/tools"/>
     <target name="checkstyle">
       <ant antfile="${tools.path}/util/checkstyle.xml">
  @@ -40,7 +37,7 @@
         build            - invokes the general build target
         dist             - executes build, javadoc and support file creation
         demo             - run the server though it's full lifecycle
  -      
  +
       </echo>
     </target>
   
  @@ -48,9 +45,7 @@
   
     <property name="enterprise" value=".." />
     <property name="apps.path" value="${enterprise}/.." />
  -  <property name="common.path" value="${apps}/common" />
  -  <property name="common.tools.path" value="${common.path}/tools" />
  -  <property name="common.lib.path" value="${common.path}/lib" />
  +  <property name="tools.path" value="${enterprise}/tools" />
     <property name="orb.path"  value="${enterprise}/orb" />
     <property name="orb.lib.path"  value="${orb.path}/lib" />
     <property name="orb.dist.path"  value="${orb.path}/build" />
  @@ -84,7 +79,7 @@
         <fileset dir="${orb.dist.path}">
           <include name="*.jar" />
         </fileset>
  -      <fileset dir="${common.lib.path}">
  +      <fileset dir="${tools.path}/lib">
           <include name="logkit-1.1.jar" />
           <include name="avalon-framework*.jar" />
         </fileset>
  @@ -247,7 +242,7 @@
           </fileset>
         </copy>
   
  -      <jar jarfile="${dist}/${project.jar}" basedir="${build}/lib" 
  +      <jar jarfile="${dist}/${project.jar}" basedir="${build}/lib"
           manifest="${etc}/${ant.project.name}.mf" />
   
     </target>
  @@ -271,15 +266,15 @@
            <include name="license.css"/>
          </fileset>
       </copy>
  -    <javadoc destdir="${javadoc.root.path}/${ant.project.name}" 
  -	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;" 
  -      noindex="false" author="false" 
  +    <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
  +	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;"
  +      noindex="false" author="false"
         use="true"
         overview="${overview.html}"
  -	windowtitle="${project.title}" 
  +	windowtitle="${project.title}"
         bottom="&lt;a href='{@docRoot}/LICENSE.HTML'/&gt;License, Disclaimer and
due credits.&lt;/a&gt;"
         additionalparam="-breakiterator -J-Xmx128m"
  -      packagenames="org.*" 
  +      packagenames="org.*"
         >
           <sourcepath path="${src}/java"/>
           <sourcepath path="${build}/ins/src"/>
  
  
  
  1.23      +2 -4      avalon-apps/enterprise/orb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/orb/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	11 Apr 2003 00:26:18 -0000	1.22
  +++ build.xml	11 Apr 2003 00:44:28 -0000	1.23
  @@ -4,12 +4,10 @@
     <property file="local.properties"/>
     <property file="build.properties"/>
   
  -  <!-- common target wrappers -->
  -
     <property name="enterprise.path" value=".."/>
     <property name="excalibur.path" value="${enterprise.path}/../../avalon-excalibur"/>
     <property name="assembly.path" value="${excalibur.path}/assembly"/>
  -  <property name="common.path" value="${enterprise.path}/../common"/>
  +  <property name="tools.path" value="${enterprise.path}/tools"/>
   
     <target name="checkstyle">
       <ant antfile="${enterprise.path}/tools/util/checkstyle.xml">
  @@ -81,7 +79,7 @@
     <property name="idl.class"  value="org.openorb.compiler.IdlCompiler" />
   
     <path id="project.classpath">
  -      <fileset dir="${common.path}/lib">
  +      <fileset dir="${tools.path}/lib">
           <include name="logkit*.jar" />
           <include name="avalon-framework*.jar" />
         </fileset>
  
  
  
  1.13      +9 -12     avalon-apps/enterprise/pss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/pss/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	4 Jan 2003 02:03:27 -0000	1.12
  +++ build.xml	11 Apr 2003 00:44:29 -0000	1.13
  @@ -5,11 +5,8 @@
     <property file="local.properties"/>
     <property file="build.properties"/>
   
  -  <!-- common target wrappers -->
  -
     <property name="enterprise.path" value=".."/>
     <property name="tools.path" value="${enterprise.path}/tools"/>
  -  <property name="common.path" value="${enterprise.path}/../common"/>
     <target name="checkstyle">
       <ant antfile="checkstyle.xml">
          <property name="checkstyle.failOnViolation" value="true"/>
  @@ -42,9 +39,9 @@
                            javadoc and handles replication of supporting
                            files under the dist directory
   
  -      install          - copies distribution jar files to the 
  +      install          - copies distribution jar files to the
                            '${install.path}' directory
  -      
  +
       </echo>
     </target>
   
  @@ -97,7 +94,7 @@
         <fileset dir="${ots.lib.path}">
           <include name="*.jar" />
         </fileset>
  -      <fileset dir="${common.path}/lib">
  +      <fileset dir="${tools.path}/lib">
           <include name="logkit-1.1.jar" />
           <include name="avalon-framework*.jar" />
         </fileset>
  @@ -161,7 +158,7 @@
   
     <target name="pss.idl" depends="pss.idl.context,compiler" if="pss.idl.modified">
         <echo message="Building PSS IDL."/>
  -	<java classname="org.apache.pss.compiler.PsdlCompiler" 
  +	<java classname="org.apache.pss.compiler.PsdlCompiler"
   	    fork="true" failonerror="true">
   	    <arg line="-silence"/>
   	    <arg line="-I ${idl}"/>
  @@ -210,7 +207,7 @@
             <include name="**/*.xinfo"/>
           </fileset>
         </copy>
  -      <jar jarfile="${dist}/${pss.jar}" basedir="${build}/pss/lib" 
  +      <jar jarfile="${dist}/${pss.jar}" basedir="${build}/pss/lib"
            manifest="${etc}/${ant.project.name}.mf"/>
     </target>
   
  @@ -304,12 +301,12 @@
            <include name="EXOLAB.TXT"/>
          </fileset>
       </copy>
  -    <javadoc destdir="${javadoc.root.path}" 
  -	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;" 
  -      noindex="false" author="false" 
  +    <javadoc destdir="${javadoc.root.path}"
  +	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;"
  +      noindex="false" author="false"
         use="true"
         overview="${overview.html}"
  -	windowtitle="${project.title}" 
  +	windowtitle="${project.title}"
         bottom="&lt;a href='{@docRoot}/LICENSE.HTML'/&gt;License, Disclaimer and
due credits.&lt;/a&gt;"
         additionalparam="-breakiterator -J-Xmx128m"
         packagenames="org.*" >
  
  
  
  1.13      +8 -9      avalon-apps/enterprise/time/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/time/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	4 Jan 2003 02:03:27 -0000	1.12
  +++ build.xml	11 Apr 2003 00:44:29 -0000	1.13
  @@ -1,5 +1,5 @@
   
  -<!-- 
  +<!--
   Time Service.
   -->
   
  @@ -11,7 +11,6 @@
     <!-- common target wrappers -->
   
     <property name="enterprise.path" value=".."/>
  -  <property name="common.path" value="${enterprise.path}/../common"/>
     <property name="tools.path" value="${enterprise.path}/tools" />
   
     <target name="checkstyle">
  @@ -43,7 +42,7 @@
         clean            - destroy the build directory
         build            - invokes the general build target
         dist             - executes build, javadoc and support file creation
  -      
  +
       </echo>
     </target>
   
  @@ -84,7 +83,7 @@
         <fileset dir="${orb.path}/build">
           <include name="*.jar" />
         </fileset>
  -      <fileset dir="${common.path}/lib">
  +      <fileset dir="${tools.path}/lib">
           <include name="logkit-1.1.jar" />
           <include name="avalon-framework*.jar" />
         </fileset>
  @@ -220,15 +219,15 @@
            <include name="license.css"/>
          </fileset>
       </copy>
  -    <javadoc destdir="${javadoc.root.path}/${ant.project.name}" 
  -	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;" 
  -      noindex="false" author="false" 
  +    <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
  +	doctitle="&lt;h1&gt;${project.title} ${VERSION}&lt;/h1&gt;"
  +      noindex="false" author="false"
         use="true"
         overview="${overview.html}"
  -	windowtitle="${project.title}" 
  +	windowtitle="${project.title}"
         bottom="&lt;a href='{@docRoot}/LICENSE.HTML'/&gt;License, Disclaimer and
due credits.&lt;/a&gt;"
         additionalparam="-breakiterator -J-Xmx128m"
  -      packagenames="org.*" 
  +      packagenames="org.*"
         >
           <sourcepath path="${src}/java"/>
           <sourcepath path="${build}/time/src"/>
  
  
  
  1.1                  avalon-apps/enterprise/tools/lib/avalon-framework-4.1.3.jar
  
  	<<Binary file>>
  
  
  1.1                  avalon-apps/enterprise/tools/lib/logkit-1.1.jar
  
  	<<Binary file>>
  
  
  1.2       +2 -13     avalon-apps/enterprise/tools/util/checkstyle.xml
  
  Index: checkstyle.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/enterprise/tools/util/checkstyle.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkstyle.xml	18 May 2002 14:59:28 -0000	1.1
  +++ checkstyle.xml	11 Apr 2003 00:44:29 -0000	1.2
  @@ -43,24 +43,13 @@
   
       <!-- common diorectories -->
       <property name="apps.dir" value="../.."/>
  -    <property name="common.dir" value="${apps.dir}/common"/>
  -    <property name="common.lib.dir" value="${common.dir}/lib"/>
  -    <property name="common.tools.dir" value="${common.dir}/tools"/>
  -
  -    <!-- common jar files -->
  -    <property name="logkit.jar" value="${common.lib.dir}/logkit.jar"/>
  -    <property name="avalon-framework.jar" value="${common.lib.dir}/avalon-framework.jar"/>
  -    <property name="phoenix-client.jar" value="${common.lib.dir}/phoenix-client.jar"/>
  -    <property name="checkstyle.jar" value="${common.tools.dir}/checkstyle-all.jar"/>
  +    <property name="tools.dir" value="${enterprise.dir}/tools"/>
   
       <!-- declaration of validation defaults -->
       <property name="checkstyle.failOnViolation" value="false"/>
   
       <!-- Classpath for tools -->
       <path id="tools.class.path">
  -        <pathelement location="${logkit.jar}"/>
  -        <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
       </path>
   
  @@ -89,7 +78,7 @@
               classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
               <classpath refid="tools.class.path"/>
           </taskdef>
  -        <checkstyle 
  +        <checkstyle
               lcurlyType="nl"
               lcurlyMethod="nl"
               lcurlyOther="nl"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message