Changeset 514

Show
Ignore:
Timestamp:
04/14/07 13:40:14 (1 year ago)
Author:
schst
Message:

Moved Stubbles javascript to /src/main/javascript, split namespace and json-rpc code in separate files, added setup target in build.xml to prepare examples, copy javascript

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/build.properties

    r107 r514  
    11build.base.dir=build 
     2examples.base.dir=docroot 
  • trunk/build.xml

    r400 r514  
    33  <property file="build.properties" /> 
    44  <taskDef name="mySimpletest" classname="MySimpleTestTask" classpath="${project.basedir}/src/test" /> 
    5    
     5 
    66  <target name="main" if="package" depends="packagecheck"> 
    77    <phing phingfile="${build.base.dir}/${package}/build.xml" inheritAll="false" /> 
    88  </target> 
    9    
     9 
    1010  <target name="packagecheck" unless="package"> 
    1111    <echo message="=====================================================" /> 
     
    1414    <echo message=" " /> 
    1515    <echo message="-Dpackage=stubbles" /> 
    16     <echo message="=====================================================" />    
     16    <echo message="=====================================================" /> 
    1717    <input propertyname="package" promptChar=":">package to build</input> 
    1818  </target> 
    19    
     19 
     20  <!-- Setup examples --> 
     21  <target name="setup" description="Setup the included examples"> 
     22    <!-- JSON-RPC --> 
     23    <mkdir dir="${examples.base.dir}/jsonrpclab/javascript"/> 
     24    <copy todir="${examples.base.dir}/jsonrpclab/javascript"> 
     25      <fileset dir="${project.basedir}/src/main/javascript"> 
     26        <include name="**/*.js"/> 
     27      </fileset> 
     28    </copy> 
     29  </target> 
     30 
    2031  <target name="test" description="run test suite"> 
    2132    <if> 
     
    2940    </if> 
    3041  </target> 
    31    
     42 
    3243  <target name="test-integration" description="run test suite"> 
    3344    <if> 
  • trunk/docroot/jsonrpclab

    • Property svn:ignore changed from
      yui
      generated-scripts
      to
      yui
      generated-scripts
      javascript
  • trunk/docroot/jsonrpclab/README

    r478 r514  
    662. Extract the archive 
    773. Move the "yui" folder into the document root 
     84. Make sure, that all javascript files from stubbles are copied to this directory, by executing "phing setup" in the Stubbles checkout folder 
  • trunk/docroot/jsonrpclab/test-json-rpc.php

    r505 r514  
    66  <script type="text/javascript" src="yui/build/yahoo/yahoo.js"></script> 
    77  <script type="text/javascript" src="yui/build/connection/connection.js"></script> 
    8   <script type="text/javascript" src="json.js"></script> 
    9   <script type="text/javascript" src="json.rpc.Client.js"></script> 
     8  <script type="text/javascript" src="javascript/json.js"></script> 
     9  <script type="text/javascript" src="javascript/stub-base.js"></script> 
     10  <script type="text/javascript" src="javascript/stub-json-rpc.js"></script> 
    1011  <script type="text/javascript" src="<?php echo dirname($_SERVER['PHP_SELF']);?>/jsonrpc.php?processor=jsonrpc&__generateProxy=true"></script> 
    1112<script type="text/javascript">