Author: buildbot
Date: Tue Jul 9 08:28:28 2013
New Revision: 868882
Log:
Staging update by buildbot for ode
Modified:
websites/staging/ode/trunk/content/ (props changed)
websites/staging/ode/trunk/content/developerguide/building-ode.html
websites/staging/ode/trunk/content/developerguide/source-code.html
Propchange: websites/staging/ode/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 9 08:28:28 2013
@@ -1 +1 @@
-1501116
+1501128
Modified: websites/staging/ode/trunk/content/developerguide/building-ode.html
==============================================================================
--- websites/staging/ode/trunk/content/developerguide/building-ode.html
(original)
+++ websites/staging/ode/trunk/content/developerguide/building-ode.html Tue Jul
9 08:28:28 2013
@@ -101,15 +101,6 @@
<p>Building from the source is usually for the thick skinned, we try to keep
our trunk stable but it's a development environment so we can never guarantee
that everything will be smooth. If you rather work with something more stable
or if you don't need the latest and greatest, using the <a
href="/getting-ode.html">latest official distribution</a> is probably a better
option.</p>
<p><a name="BuildingODE-Gettingthesourcecode"></a></p>
<h2 id="getting-the-source-code">Getting the source code</h2>
-<p><a name="BuildingODE-withSubversion"></a></p>
-<h3 id="with-subversion">with Subversion</h3>
-<p>First you will have to make sure that you have <a
href="http://svn.tigris.org";>Subversion</a>. If you don't know what Subversion
is or don't have it installed, check <a
href="http://svnbook.red-bean.com";>here</a>. Once installed run:</p>
-<p>Development branch:</p>
-<div class="codehilite"><pre>$> svn checkout
http://svn.apache.org/repos/asf/ode/trunk ode-trunk
-</pre></div>
-
-
-<p>For more information or if you have any problem with Subversion (like being
behind a proxy or a firewall) check the <a href="source-code.html">Source
Code</a> section.</p>
<p><a name="BuildingODE-withGit"></a></p>
<h3 id="with-git">with Git</h3>
<p>The Subversion repository is mirrored by a Git repository at <a
href="http://git.apache.org/ode.git";>http://git.apache.org/ode.git</a> or <a
href="http://github.com/apache/ode";>Github</a>.
Modified: websites/staging/ode/trunk/content/developerguide/source-code.html
==============================================================================
--- websites/staging/ode/trunk/content/developerguide/source-code.html
(original)
+++ websites/staging/ode/trunk/content/developerguide/source-code.html Tue Jul
9 08:28:28 2013
@@ -99,168 +99,48 @@
<div class="span12">
<p><a name="SourceCode-Overview"></a></p>
<h1 id="overview">Overview</h1>
-<p>ODE uses <a href="http://subversion.tigris.org/";>Subversion</a> to manage
its source code. Instructions on Subversion use can be found <a
href="http://svnbook.red-bean.com";>here</a>.</p>
+<p>ODE uses <a href="http://git-scm.com/";>Git</a> to manage its source code.
Instructions on Git use can be found <a
href="http://git-scm.com/documentation";>here</a>.</p>
<p><a name="SourceCode-Mainrepository"></a></p>
<h2 id="main-repository">Main repository</h2>
<p><a name="SourceCode-WebAccess"></a></p>
-<h3 id="web-access">Web Access</h3>
+<h3 id="web-access-via-github">Web Access (via Github)</h3>
<dl>
<dt>1.3.x branch (Stable)</dt>
-<dd><a
href="http://svn.apache.org/repos/asf/ode/branches/ode-1.3.6.x";>http://svn.apache.org/repos/asf/ode/branches/ode-1.3.6.x</a></dd>
+<dd><a
href="https://github.com/apache/ode/tree/ode-1.3.6.x";>https://github.com/apache/ode/tree/ode-1.3.6.x</a></dd>
<dt>Trunk (Development)</dt>
-<dd><a
href="http://svn.apache.org/viewvc/ode/trunk/";>http://svn.apache.org/viewvc/ode/trunk/</a></dd>
+<dd><a
href="https://github.com/apache/ode/";>https://github.com/apache/ode/</a></dd>
</dl>
-<p>or via <a href="http://fisheye6.cenqua.com/browse/ode";>Fisheye</a> (hosted
by Cenqua/Atlassian)</p>
<p><a name="SourceCode-Anonymousaccess"></a></p>
<h3 id="anonymous-access">Anonymous access</h3>
<p>ODE source can be checked out anonymously with this command:</p>
-<div class="codehilite"><pre>$> svn checkout
http://svn.apache.org/repos/asf/ode/trunk ode
+<div class="codehilite"><pre>$> git clone git://git.apache.org/ode.git
</pre></div>
<p>Once you have ODE checked out you can update the source by executing the
following command from within the <em>ode</em> directory.</p>
-<div class="codehilite"><pre>$> svn update
+<div class="codehilite"><pre>$> git pull
</pre></div>
<p>Once you've got the code you'll probably want to build it; for instructions
see <a href="/developerguide/building-ode.html">Building ODE</a>.</p>
-<p><a name="SourceCode-Accessfrombehindafirewall"></a></p>
-<h2 id="access-from-behind-a-firewall">Access from behind a firewall</h2>
-<p>For those users who are stuck behind a corporate firewall which is blocking
http access to the Subversion repository, you can try to access it via
HTTPS:</p>
-<div class="codehilite"><pre>$> svn checkout
https://svn.apache.org/repos/asf/ode/trunk ode
-</pre></div>
-
-
-<p><a name="SourceCode-Accessthroughaproxy"></a></p>
-<h2 id="access-through-a-proxy">Access through a proxy</h2>
-<p>The Subversion client can go through a proxy, if you configure it to do so.
First, edit your "servers" configuration file to indicate which proxy to use.
The files location depends on your operating system. On Linux or Unix it is
located in the directory "~/.subversion". On Windows it is in
"%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden
directory.)</p>
-<p>There are comments in the file explaining what to do. If you don't have
that file, get the latest Subversion client and run any command; this will
cause the configuration directory and template files to be created.</p>
-<p>Example : Edit the 'servers' file and add something like :</p>
-<div class="codehilite"><pre><span class="k">[global]</span>
-<span class="na">http-proxy-host</span> <span class="o">=</span> <span
class="s">your.proxy.name</span>
-<span class="na">http-proxy-port</span> <span class="o">=</span> <span
class="s">3128</span>
-</pre></div>
-
-
<p><a name="SourceCode-SubmittingaPatch"></a></p>
<h3 id="submitting-a-patch">Submitting a Patch</h3>
-<p>If you make changes to ODE, and would like to contribute the to the
project, you should create a patch and post it to the <a
href="http://issues.apache.org/jira/browse/ODE";>ODE JIRA issue tracker</a>. To
create a patch, simply execute the following command:</p>
-<div class="codehilite"><pre>$> svn diff > your-changes.patch
+<p>If you make changes to ODE, and would like to contribute the to the
project, you should create a patch and post it to the <a
href="http://issues.apache.org/jira/browse/ODE";>ODE JIRA issue tracker</a>. To
create a patch, simply execute one of the following commands:</p>
+<div class="codehilite"><pre>$> git format-patch master --stdout >
your-changes.patch
+
+:::text
+$> git diff > your-changes.patch
</pre></div>
<p><a name="SourceCode-DeveloperAccess"></a></p>
<h2 id="developer-access">Developer Access</h2>
-<p>Everyone can access the ODE Subversion repository via HTTPS, but ODE
Committers must checkout the Subversion repository via HTTPS.</p>
-<div class="codehilite"><pre>$> svn checkout
https://svn.apache.org/repos/asf/ode/trunk ode
-</pre></div>
-
-
-<p>To commit changes to the repository, you must set your password on the
Apache Subversion server. To set your password, use ssh to connect to
svn.apache.org, and enter the command '''svnpasswd'''. This will prompt you to
enter a svn password of your choice (pick a safe password). Now, now your are
ready to commit changes using your username/password. Execute the following
command to commit your changes (svn will prompt you for your password)</p>
-<div class="codehilite"><pre>$> svn commit --username your-username
-Authentication realm: <https://svn.apache.org:443> ASF Committers
-Password for 'your-username': your-password
-</pre></div>
-
-
-<p>You can also pass your password on the command line directly, but this is a
security problem on multiuser unix computers (the command line arguments are
available via the ps command). Here is the command if you are Windows or a
single user unix computer:</p>
-<div class="codehilite"><pre>$> svn commit --username your-username
--password your-password
-</pre></div>
-
-
-<p>Remember to replace 'your-username' and 'your-password' with your actual
username and password on svn.apache.org.</p>
-<p><a name="SourceCode-Subversionclientconfig"></a></p>
-<h3 id="subversion-client-config">Subversion client config</h3>
-<p>Add this to your subversion client configuration file:</p>
-<p><em>Note:</em> make sure the settings are merged into the appropriate
section if it already exists,
-as duplicate section names can cause problems.</p>
-<p>Possible locations of your subversion client configuration
-<em> Windows: C:\Documents and Settings\yourname\Application
Data\Subversion\config
-</em> Linux: \~/.subversion/config</p>
-<p><em>Note:</em> The names of svn keywords that are substituted in files may
not match the SVN keywords in this config file. This is because a number of
SVN keywords have alternate names that can be used. For example the "Revision"
keyword may be specified as "Rev" and "LastChangedRevision" and can be used
interchangably. This file uses the standard Subversion Keywords, not their
alternate forms for clarity and consistency with the Subversion config files
used by other ASF projects. This config file does not need to be changed to
use the alternate forms for the alternate forms to be able to be used. For
further information on Subversion keywords see <a
href="http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4";>http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4</a>.</p>
-<div class="codehilite"><pre><span class="k">[miscellany]</span>
-<span class="na">global-ignores</span> <span class="o">=</span> <span
class="s">*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store build dist
target</span>
-<span class="na">enable-auto-props</span> <span class="o">=</span> <span
class="s">yes</span>
-
-<span class="k">[auto-props]</span>
-<span class="na">*.c</span> <span class="o">=</span> <span
class="s">svn:eol-style=native;svn:keywords=Date Author Id Revision
HeadURL</span>
-<span class="na">*.cpp</span> <span class="o">=</span> <span
class="s">svn:eol-style=native;svn:keywords=Date Author Id Revision
HeadURL</span>
-<span class="na">*.h</span> <span class="o">=</span> <span
class="s">svn:eol-style=native;svn:keywords=Date Author Id Revision
HeadURL</span>
-<span class="na">*.dsp</span> <span class="o">=</span> <span
class="s">svn:eol-style=CRLF</span>
-<span class="na">*.dsw</span> <span class="o">=</span> <span
class="s">svn:eol-style=CRLF</span>
-<span class="na">*.sh</span> <span class="o">=</span> <span
class="s">svn:executable;svn:eol-style=native;svn:keywords=Date Revision</span>
-<span class="na">*.cmd</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=CRLF</span>
-<span class="na">*.bat</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=CRLF</span>
-<span class="na">Makefile</span> <span class="o">=</span> <span
class="s">svn:eol-style=native;svn:keywords=Date Author Id Revision
HeadURL</span>
-<span class="na">*.obj</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.bin</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.bmp</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/bmp</span>
-<span class="na">*.class</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/java</span>
-<span class="na">*.doc</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/msword</span>
-<span class="na">*.exe</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.gif</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/gif</span>
-<span class="na">*.gz</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/x-gzip</span>
-<span class="na">*.jar</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/java-archive</span>
-<span class="na">*.jelly</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.jpg</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/jpeg</span>
-<span class="na">*.jpeg</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/jpeg</span>
-<span class="na">*.pdf</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/pdf</span>
-<span class="na">*.png</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/png</span>
-<span class="na">*.tgz</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.tif</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/tiff</span>
-<span class="na">*.tiff</span> <span class="o">=</span> <span
class="s">svn:mime-type=image/tiff</span>
-<span class="na">*.zip</span> <span class="o">=</span> <span
class="s">svn:mime-type=application/zip</span>
-<span class="na">*.txt</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.xml</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.ent</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.dtd</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.vsl</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.xsd</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.xsl</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.wsdl</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.htm</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/html;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.html</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/html;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.css</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/css;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.js</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.jsp</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.txt</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.java</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.properties</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-<span class="na">*.sql</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
Revision</span>
-</pre></div>
-
-
-<p>To verify the auto-props processing is working you can test adding a file
without committing it (Windows example):</p>
-<div class="codehilite"><pre>C:\projects\ODE>echo
testdata>test-auto-props.xml
-
-C:\projects\ODE>svn add test-auto-props.xml
-A test-auto-props.xml
-
-C:\projects\ODE>svn proplist test-auto-props.xml
-Properties on 'test-auto-props.xml':
- svn:mime-type
- svn:keywords
- svn:eol-style
-
-C:\projects\ODE>svn propget svn:mime-type test-auto-props.xml
-text/xml
-
-C:\projects\ODE>svn propget svn:keywords test-auto-props.xml
-Date Author Id Revision HeadURL
-
-C:\projects\ODE>svn propget svn:eol-style test-auto-props.xml
-native
-
-C:\projects\ODE>svn revert test-auto-props.xml
-Reverted 'test-auto-props.xml'
-
-C:\projects\ODE>del test-auto-props.xml
+<p>Everyone can access the ODE Git repository via HTTP, but ODE Committers
must checkout the repository via HTTPS.</p>
+<div class="codehilite"><pre>$> git clone
https://git-wip-us.apache.org/repos/asf/ode.git
</pre></div>
-<p>If you didn't get the results above, double check that the following line
in the miscellany section is set and not commented out or set elsewhere.</p>
-<div class="codehilite"><pre><span class="na">enable-auto-props</span> <span
class="o">=</span> <span class="s">yes</span>
-</pre></div>
+<p>For further instructions, please see <a
href="https://git-wip-us.apache.org/";>here</a></p>
</div>
</div>
