You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2013/07/09 10:28:25 UTC
svn commit: r1501128 - in /ode/site/trunk/content/developerguide:
building-ode.mdtext source-code.mdtext
Author: vanto
Date: Tue Jul 9 08:28:24 2013
New Revision: 1501128
URL: http://svn.apache.org/r1501128
Log:
svn -> git
Modified:
ode/site/trunk/content/developerguide/building-ode.mdtext
ode/site/trunk/content/developerguide/source-code.mdtext
Modified: ode/site/trunk/content/developerguide/building-ode.mdtext
URL: http://svn.apache.org/viewvc/ode/site/trunk/content/developerguide/building-ode.mdtext?rev=1501128&r1=1501127&r2=1501128&view=diff
==============================================================================
--- ode/site/trunk/content/developerguide/building-ode.mdtext (original)
+++ ode/site/trunk/content/developerguide/building-ode.mdtext Tue Jul 9 08:28:24 2013
@@ -7,19 +7,6 @@ Building from the source is usually for
<a name="BuildingODE-Gettingthesourcecode"></a>
## Getting the source code
-<a name="BuildingODE-withSubversion"></a>
-### with Subversion
-
-First you will have to make sure that you have [Subversion](http://svn.tigris.org). If you don't know what Subversion is or don't have it installed, check [here](http://svnbook.red-bean.com). Once installed run:
-
-Development branch:
-
- :::text
- $> svn checkout http://svn.apache.org/repos/asf/ode/trunk ode-trunk
-
-
-For more information or if you have any problem with Subversion (like being behind a proxy or a firewall) check the [Source Code](source-code.html) section.
-
<a name="BuildingODE-withGit"></a>
### with Git
@@ -31,7 +18,6 @@ So if you're more comfortable with Git,
$> cd ode
$> git checkout -b 1.X --track origin/trunk
-
<a name="BuildingODE-BuildingWithBuildr"></a>
## Building With Buildr
Modified: ode/site/trunk/content/developerguide/source-code.mdtext
URL: http://svn.apache.org/viewvc/ode/site/trunk/content/developerguide/source-code.mdtext?rev=1501128&r1=1501127&r2=1501128&view=diff
==============================================================================
--- ode/site/trunk/content/developerguide/source-code.mdtext (original)
+++ ode/site/trunk/content/developerguide/source-code.mdtext Tue Jul 9 08:28:24 2013
@@ -4,21 +4,19 @@ Category: contributing
<a name="SourceCode-Overview"></a>
# Overview
-ODE uses [Subversion](http://subversion.tigris.org/) to manage its source code. Instructions on Subversion use can be found [here](http://svnbook.red-bean.com).
+ODE uses [Git](http://git-scm.com/) to manage its source code. Instructions on Git use can be found [here](http://git-scm.com/documentation).
<a name="SourceCode-Mainrepository"></a>
## Main repository
<a name="SourceCode-WebAccess"></a>
-### Web Access
+### Web Access (via Github)
1.3.x branch (Stable)
-: [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)
+: [https://github.com/apache/ode/tree/ode-1.3.6.x](https://github.com/apache/ode/tree/ode-1.3.6.x)
Trunk (Development)
-: [http://svn.apache.org/viewvc/ode/trunk/](http://svn.apache.org/viewvc/ode/trunk/)
-
-or via [Fisheye](http://fisheye6.cenqua.com/browse/ode) (hosted by Cenqua/Atlassian)
+: [https://github.com/apache/ode/](https://github.com/apache/ode/)
<a name="SourceCode-Anonymousaccess"></a>
### Anonymous access
@@ -26,162 +24,32 @@ or via [Fisheye](http://fisheye6.cenqua.
ODE source can be checked out anonymously with this command:
:::text
- $> svn checkout http://svn.apache.org/repos/asf/ode/trunk ode
+ $> git clone git://git.apache.org/ode.git
Once you have ODE checked out you can update the source by executing the following command from within the *ode* directory.
:::text
- $> svn update
+ $> git pull
Once you've got the code you'll probably want to build it; for instructions see [Building ODE](/developerguide/building-ode.html).
-<a name="SourceCode-Accessfrombehindafirewall"></a>
-## Access from behind a firewall
-
-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:
-
- :::text
- $> svn checkout https://svn.apache.org/repos/asf/ode/trunk ode
-
-
-<a name="SourceCode-Accessthroughaproxy"></a>
-## Access through a proxy
-
-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.)
-
-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.
-
-Example : Edit the 'servers' file and add something like :
-
- [global]
- http-proxy-host = your.proxy.name
- http-proxy-port = 3128
-
-
<a name="SourceCode-SubmittingaPatch"></a>
### Submitting a Patch
-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 [ODE JIRA issue tracker](http://issues.apache.org/jira/browse/ODE). To create a patch, simply execute the following command:
+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 [ODE JIRA issue tracker](http://issues.apache.org/jira/browse/ODE). To create a patch, simply execute one of the following commands:
:::text
- $> svn diff > your-changes.patch
+ $> git format-patch master --stdout > your-changes.patch
+ :::text
+ $> git diff > your-changes.patch
<a name="SourceCode-DeveloperAccess"></a>
## Developer Access
-Everyone can access the ODE Subversion repository via HTTPS, but ODE Committers must checkout the Subversion repository via HTTPS.
+Everyone can access the ODE Git repository via HTTP, but ODE Committers must checkout the repository via HTTPS.
:::text
- $> svn checkout https://svn.apache.org/repos/asf/ode/trunk ode
-
-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)
-
- :::text
- $> svn commit --username your-username
- Authentication realm: <https://svn.apache.org:443> ASF Committers
- Password for 'your-username': your-password
-
-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:
-
- :::text
- $> svn commit --username your-username --password your-password
-
-Remember to replace 'your-username' and 'your-password' with your actual username and password on svn.apache.org.
-
-<a name="SourceCode-Subversionclientconfig"></a>
-### Subversion client config
-
-Add this to your subversion client configuration file:
-
-*Note:* make sure the settings are merged into the appropriate section if it already exists,
-as duplicate section names can cause problems.
-
-Possible locations of your subversion client configuration
-* Windows: C:\Documents and Settings\yourname\Application Data\Subversion\config
-* Linux: \~/.subversion/config
-
-*Note:* 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 [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).
-
- [miscellany]
- global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store build dist target
- enable-auto-props = yes
-
- [auto-props]
- *.c = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
- *.cpp = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
- *.h = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
- *.dsp = svn:eol-style=CRLF
- *.dsw = svn:eol-style=CRLF
- *.sh = svn:executable;svn:eol-style=native;svn:keywords=Date Revision
- *.cmd = svn:mime-type=text/plain;svn:eol-style=CRLF
- *.bat = svn:mime-type=text/plain;svn:eol-style=CRLF
- Makefile = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
- *.obj = svn:mime-type=application/octet-stream
- *.bin = svn:mime-type=application/octet-stream
- *.bmp = svn:mime-type=image/bmp
- *.class = svn:mime-type=application/java
- *.doc = svn:mime-type=application/msword
- *.exe = svn:mime-type=application/octet-stream
- *.gif = svn:mime-type=image/gif
- *.gz = svn:mime-type=application/x-gzip
- *.jar = svn:mime-type=application/java-archive
- *.jelly = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.jpg = svn:mime-type=image/jpeg
- *.jpeg = svn:mime-type=image/jpeg
- *.pdf = svn:mime-type=application/pdf
- *.png = svn:mime-type=image/png
- *.tgz = svn:mime-type=application/octet-stream
- *.tif = svn:mime-type=image/tiff
- *.tiff = svn:mime-type=image/tiff
- *.zip = svn:mime-type=application/zip
- *.txt = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.xml = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date Revision
- *.ent = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.dtd = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.vsl = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.xsd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date Revision
- *.xsl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date Revision
- *.wsdl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Date Revision
- *.htm = svn:mime-type=text/html;svn:eol-style=native;svn:keywords=Date Revision
- *.html = svn:mime-type=text/html;svn:eol-style=native;svn:keywords=Date Revision
- *.css = svn:mime-type=text/css;svn:eol-style=native;svn:keywords=Date Revision
- *.js = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.jsp = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.txt = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.java = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.properties = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
- *.sql = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date Revision
-
-To verify the auto-props processing is working you can test adding a file without committing it (Windows example):
-
- :::text
- 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
-
-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.
+ $> git clone https://git-wip-us.apache.org/repos/asf/ode.git
- :::ini
- enable-auto-props = yes
+For further instructions, please see [here](https://git-wip-us.apache.org/)
\ No newline at end of file