User: pathoss 
  Date: 02/05/20 14:44:15

  Modified:    modules  Tag: MODULE_REFACTORING_BRANCH modules-common.xml
  Log:
  Fixed merge issue with file.url.prefix. Thanks to Erik Hatcher for giving some tips.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17  +10 -1     xdoclet/modules/Attic/modules-common.xml
  
  Index: modules-common.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/Attic/modules-common.xml,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -w -r1.1.2.16 -r1.1.2.17
  --- modules-common.xml        20 May 2002 17:20:06 -0000      1.1.2.16
  +++ modules-common.xml        20 May 2002 21:44:15 -0000      1.1.2.17
  @@ -20,7 +20,7 @@
       <!-- Initialises the build.                                              -->
       <!-- =================================================================== -->
       <target name="init">
  -        <echo>******** Building XDoclet module '${ant.project.name}' ********</echo>
  +        <echo>******** Building XDoclet Module '${ant.project.name}' ********</echo>
   
           <!-- Define classpath required for generating xml descriptors -->
           <path id="module.xml.class.path">
  @@ -32,6 +32,7 @@
                   <include name="*.jar"/>
               </fileset>
           </path>
  +
           <!-- Define classpath required for compiling modules -->
           <path id="module.compile.class.path">
               <pathelement location="${commons-logging.jar}"/>
  @@ -43,10 +44,18 @@
               </fileset>
   
           </path>
  +
           <!-- Define the xdoclet task -->
           <taskdef name="xdoclet" classname="xdoclet.DocletTask"
               classpathref="module.xml.class.path"
           />
  +
  +        <condition property="file.url.prefix" value="file://">
  +            <os family="unix" />
  +        </condition>
  +        <condition property="file.url.prefix" value="file:/">
  +            <os family="windows" />
  +        </condition>
   
                <!-- Checks for xtags.xml -->
                <available file="${module.src.dir}/META-INF/xtags.xml" 
property="module.xtags.exists"/>
  
  
  

_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to