Changeset 1648

Show
Ignore:
Timestamp:
06/23/08 23:36:03 (2 months ago)
Author:
mikey
Message:

clean up json-rpc setup
copy all config files of a type instead of only one specific

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/resources/phing/build-project.xml

    r1645 r1648  
    5757      </then> 
    5858    </if> 
    59     <copy file="${stubbles.projects.path}/${stubbles.project.copy}/config/xml/config.xml" tofile="${stubbles.project.path}/config/xml/config.xml" overwrite="true"/> 
    60     <copy file="${stubbles.projects.path}/${stubbles.project.copy}/config/xml/interceptors.xml" tofile="${stubbles.project.path}/config/xml/interceptors.xml" overwrite="true"/> 
     59    <copy todir="${stubbles.project.path}/config/xml"> 
     60      <fileset dir="${stubbles.projects.path}/${stubbles.project.copy}/config/xml"> 
     61        <include name="config*.xml"/> 
     62      </fileset> 
     63    </copy> 
     64    <copy todir="${stubbles.project.path}/config/xml"> 
     65      <fileset dir="${stubbles.projects.path}/${stubbles.project.copy}/config/xml"> 
     66        <include name="interceptors*.xml"/> 
     67      </fileset> 
     68    </copy> 
    6169    <input propertyname="variantmanager.enabled" promptChar="?" defaultValue="Y">Do you want to enable variant manager functionality? (Y/N)</input> 
    6270    <if> 
    …… 
    116124        <echo>| Setting up JSON-RPC package    |</echo> 
    117125        <echo>----------------------------------</echo> 
    118         <input propertyname="jsonrpc.clients.dir" promptChar=":" defaultValue="javascript/genjs">Please supply the directory for generated clients</input> 
    119         <mkdir dir="${stubbles.project.path}/docroot/${jsonrpc.clients.dir}"/> 
    120         <!--input propertyname="jsonrpc.clients.ns" promptChar=":" defaultValue="stubbles.json.proxy">Please supply the JavaScript namespace for the generated proxies (without '.' at the end)</input--> 
    121         <copy file="${stubbles.projects.path}/${stubbles.project.copy}/config/json-rpc-service.ini" tofile="${stubbles.project.path}/config/json-rpc-service.ini" overwrite="true"> 
    122           <filterchain> 
    123             <expandproperties/> 
    124           </filterchain> 
    125         </copy> 
     126        <copy file="${stubbles.projects.path}/${stubbles.project.copy}/config/json-rpc-service.ini" tofile="${stubbles.project.path}/config/json-rpc-service.ini" overwrite="true"/> 
    126127      </then> 
    127128      <else> 
    …… 
    140141        <echo>----------------------------------</echo> 
    141142        <mkdir dir="${stubbles.project.path}/log"/> 
    142         <copy file="${stubbles.projects.path}/${stubbles.project.copy}/config/xml/logging.xml" tofile="${stubbles.project.path}/config/xml/logging.xml" overwrite="true"/> 
     143        <copy todir="${stubbles.project.path}/config/xml"> 
     144          <fileset dir="${stubbles.projects.path}/${stubbles.project.copy}/config/xml"> 
     145            <include name="logging*.xml"/> 
     146          </fileset> 
     147        </copy> 
    143148      </then> 
    144149      <else>