jvanzyl     01/09/03 10:19:23

  Modified:    .        build.xml
               src/core/java/org/apache/fulcrum BaseServiceBroker.java
  Added:       .        intake.dtd
  Log:
  - adding intake.dtd to the top level directory for now, until the build per
    service is setup.
  
  Revision  Changes    Path
  1.23      +7 -0      jakarta-turbine-fulcrum/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml 2001/08/31 07:45:38     1.22
  +++ build.xml 2001/09/03 17:19:23     1.23
  @@ -359,6 +359,13 @@
     <!-- ================================================================== -->
     
     <target name="jar" depends="compile" description="--> generates the fulcrum.jar">
  +    
  +    <!-- copy intake.dtd to the right place -->
  +    <copy 
  +      file="intake.dtd"
  +      todir="${build.dir}/classes/org/apache/fulcrum/intake/transform"
  +    />
  +    
       <jar jarfile="${build.dir}/${final.name}.jar"
            basedir="${build.dir}/classes"
            excludes="**/package.html"/>
  
  
  
  1.1                  jakarta-turbine-fulcrum/intake.dtd
  
  Index: intake.dtd
  ===================================================================
  <!-- 
      Intake XML input constraints DTD 
      $Id: intake.dtd,v 1.1 2001/09/03 17:19:23 jvanzyl Exp $
  -->
  
  <!ELEMENT input-data (group+)>
  <!ATTLIST input-data 
    basePackage CDATA #IMPLIED
  >
  
  <!ELEMENT group (field+)>
  <!ATTLIST group 
    key CDATA #REQUIRED
    name CDATA #REQUIRED
    mapToObject CDATA #IMPLIED
  >
  
  <!ELEMENT field (rule*,required-message?)>
  <!ATTLIST field 
    key CDATA #REQUIRED
    name CDATA #REQUIRED
    type ( boolean | BigDecimal | short | int  | long   | float 
         | double  | BigInteger | byte  | char | String | Date  
         | StringKey | NumberKey | DateKey | ComboKey ) "String"      
    onError CDATA #IMPLIED
    multiValued ( true | false ) "false"
    displayName CDATA #IMPLIED
    mapToObject CDATA #IMPLIED
    mapToProperty CDATA #IMPLIED
    validator CDATA #IMPLIED
  >
  
                    
  <!ELEMENT rule (#PCDATA)>
  <!ATTLIST rule 
    name CDATA #REQUIRED
    value CDATA #REQUIRED
  >
  
  <!ELEMENT required-message (#PCDATA)>
  
  
  
  
  1.8       +3 -2      
jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/BaseServiceBroker.java
  
  Index: BaseServiceBroker.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/BaseServiceBroker.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BaseServiceBroker.java    2001/08/31 22:40:14     1.7
  +++ BaseServiceBroker.java    2001/09/03 17:19:23     1.8
  @@ -92,9 +92,10 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: BaseServiceBroker.java,v 1.7 2001/08/31 22:40:14 jvanzyl Exp $
  + * @version $Id: BaseServiceBroker.java,v 1.8 2001/09/03 17:19:23 jvanzyl Exp $
    */
  -public abstract class BaseServiceBroker implements ServiceBroker
  +public abstract class BaseServiceBroker 
  +    implements ServiceBroker
   {
       /**
        * Mapping of Service names to class names.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to