You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by bu...@apache.org on 2014/09/03 14:15:52 UTC

svn commit: r921129 - in /websites/staging/olingo/trunk/content: ./ doc/javascript/project-build.html doc/javascript/project-setup.html

Author: buildbot
Date: Wed Sep  3 12:15:52 2014
New Revision: 921129

Log:
Staging update by buildbot for olingo

Modified:
    websites/staging/olingo/trunk/content/   (props changed)
    websites/staging/olingo/trunk/content/doc/javascript/project-build.html
    websites/staging/olingo/trunk/content/doc/javascript/project-setup.html

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep  3 12:15:52 2014
@@ -1 +1 @@
-1621765
+1622232

Modified: websites/staging/olingo/trunk/content/doc/javascript/project-build.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/javascript/project-build.html (original)
+++ websites/staging/olingo/trunk/content/doc/javascript/project-build.html Wed Sep  3 12:15:52 2014
@@ -85,7 +85,7 @@
       </div><!-- Main component for a primary marketing message or call to action --><h1 id="project-build">Project build</h1>
 <h3 id="test-for-proper-installation">Test for proper installation</h3>
 <p>Open your (git-)bash and navigate to the folder 
-<code>olingo-odata4-js/datajs/</code></p>
+<code>olingo-odata4-js/odatajs/</code></p>
 <p>Entry the <em>grunt -version</em> command to show the version of the globaly installed grund-client and the local grunt installation:</p>
 <div class="codehilite"><pre>$ <span class="n">grunt</span> <span class="o">-</span><span class="n">version</span>
 <span class="n">grunt</span><span class="o">-</span><span class="n">cli</span> <span class="n">v0</span><span class="p">.</span>1<span class="p">.</span>13
@@ -99,7 +99,7 @@
 <p>This task chain will perform the following grunt tasks:</p>
 <ul>
 <li>
-<p><code>browserify:datajs</code>
+<p><code>browserify:src</code>
   Browserify parses the main file of the library <em>src/index.js</em> and collects all required node modules to build an single monolitic file for easy use in the browser. While doing this all license headers from the seperate filed will be removed.
   The file will be saved in <em>build/odatajs.<version>.js</em></p>
 </li>
@@ -113,7 +113,7 @@
 </li>
 </ul>
 <h3 id="check-the-license-headers">Check the license headers</h3>
-<p><strong><code>grunt rat</code></strong></p><div align="center">
+<p><strong><code>grunt custom-license-check</code></strong></p><div align="center">
 <p>Copyright © 2013-2014, The Apache Software Foundation<br>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and 
 				the Apache Olingo project logo are trademarks of the Apache Software 

Modified: websites/staging/olingo/trunk/content/doc/javascript/project-setup.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/javascript/project-setup.html (original)
+++ websites/staging/olingo/trunk/content/doc/javascript/project-setup.html Wed Sep  3 12:15:52 2014
@@ -128,7 +128,7 @@ $ <span class="n">java</span> <span clas
 <h3 id="install-the-project-dependencies">Install the project dependencies</h3>
 <h5 id="java-script">Java Script</h5>
 <p>After downloading navigate into the project folder via</p>
-<p><code>cd olingo-odata4-js/datajs/</code></p>
+<p><code>cd olingo-odata4-js/odatajs/</code></p>
 <p>and install the dependencies via npm (node package manager) with</p>
 <p><code>npm install</code></p>
 <p>npm will check all dependencies listed in the package.json file and install them recursively.</p>
@@ -140,14 +140,18 @@ $ <span class="n">java</span> <span clas
 <h5 id="java">Java</h5>
 <p>If you want to run the Apache release audit tools (<a href="http://creadur.apache.org/rat/">Apache Rat™</a> ) please perform the 
 following steps:</p>
-<p>Navigate to 
-<code>./olingo-odata4-js/odatajs/grunt-config/custom-tasks/rat</code></p>
-<p>Run <code>npm install</code></p>
+<ul>
+<li>Navigate to 
+<code>./olingo-odata4-js/odatajs/grunt-config/custom-tasks/rat</code></li>
+<li>Run <code>npm install</code> to install the node_modules required by the rat tool</li>
+</ul>
+<p>then</p>
 <ul>
 <li>Download the Rat binaries apache-rat-0.11-bin.zip from http://creadur.apache.org/rat/download_rat.cgi</li>
 <li>Unpack the apache-rat-0.11-bin.zip to <em>./olingo-odata4-js/odatajs/grunt-config/custom-tasks/rat/tools</em></li>
-<li>Check that file <em>./olingo-odata4-js/datajs/grunt-config/custom-tasks/rat/tools/apache-rat-0.11/apache-rat-0.10.jar</em> exists</li>
+<li>Check that file <em>./olingo-odata4-js/odatajs/grunt-config/custom-tasks/rat/tools/apache-rat-0.11/apache-rat-0.10.jar</em> exists</li>
 </ul>
+<p>*</p>
 <h5 id="c">C#</h5>
 <p>In order to run the service for testing you need the the "Microsoft Visual Studio SP1" with the extension 
  "NuGet package manager". </p>