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 2015/10/05 13:25:35 UTC
svn commit: r967807 - in /websites/staging/olingo/trunk/content: ./
doc/javascript/ doc/odata2/ doc/odata2/tutorials/ doc/odata4/ javadoc/odata2/
Author: buildbot
Date: Mon Oct 5 11:25:34 2015
New Revision: 967807
Log:
Staging update by buildbot for olingo
Removed:
websites/staging/olingo/trunk/content/javadoc/odata2/
Modified:
websites/staging/olingo/trunk/content/ (props changed)
websites/staging/olingo/trunk/content/doap_Olingo.rdf
websites/staging/olingo/trunk/content/doc/javascript/project-release.html
websites/staging/olingo/trunk/content/doc/odata2/download.html
websites/staging/olingo/trunk/content/doc/odata2/privacy.html
websites/staging/olingo/trunk/content/doc/odata2/release.html
websites/staging/olingo/trunk/content/doc/odata2/tutorials/ExtendingtheEDM.html
websites/staging/olingo/trunk/content/doc/odata2/tutorials/debug.html
websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html
websites/staging/olingo/trunk/content/doc/odata4/release.html
websites/staging/olingo/trunk/content/sitemap.html
Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 5 11:25:34 2015
@@ -1 +1 @@
-1704921
+1706809
Modified: websites/staging/olingo/trunk/content/doap_Olingo.rdf
==============================================================================
Binary files - no diff available.
Modified: websites/staging/olingo/trunk/content/doc/javascript/project-release.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/javascript/project-release.html (original)
+++ websites/staging/olingo/trunk/content/doc/javascript/project-release.html Mon Oct 5 11:25:34 2015
@@ -100,42 +100,42 @@ h2:hover > .headerlink, h3:hover > .head
<h1 id="apache-olingo-odata-client-for-javascript-release-documentation">Apache Olingo OData Client for JavaScript Release Documentation<a class="headerlink" href="#apache-olingo-odata-client-for-javascript-release-documentation" title="Permanent link">¶</a></h1>
<hr />
<h3 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h3>
-<p>This document describes the release guidelines for Apache Olingo OData Client for JavaScript (referenced in this document as ODataJS).
+<p>This document describes the release guidelines for Apache Olingo OData Client for JavaScript (referenced in this document as ODataJS).
This is similar to <a href="http://maven.apache.org/developers/release/apache-release.html">standard Apache procedures to release</a>
for Maven based projects at Apache, but since it is an JavaScript library it is adopted to be used with grunt js.</p>
<h3 id="build-environment">Build Environment<a class="headerlink" href="#build-environment" title="Permanent link">¶</a></h3>
-<p>Apache Olingo is built and released with <a href="http://nodejs.org/">Node.js®</a> in combination with
-<a href="http://gruntjs.com/">grunt task runner</a> </p>
+<p>Apache Olingo is built and released with <a href="http://nodejs.org/">Node.js®</a> in combination with
+<a href="http://gruntjs.com/">grunt task runner</a></p>
<h3 id="release-artifacts">Release Artifacts<a class="headerlink" href="#release-artifacts" title="Permanent link">¶</a></h3>
<p>An Apache Olingo ODataJS release consists of:</p>
<ul>
<li>
-<p><strong>Main artifact</strong>: <code><artifactId>-<version>.<ext></code>
- <br/> A library artifact bundle containing all libraries necessary use the OData Client for JavaScript
+<p><strong>Main artifact</strong>: <code><artifactId>-<version>.<ext></code>
+ <br/> A library artifact bundle containing all libraries necessary use the OData Client for JavaScript
<br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><strong>JavaScript Doc artifact</strong>: <code><artifactId>-<version>-doc.<ext></code>
- <br/> A documentation bundle containing the documentation for the ODataJS library.
+<p><strong>JavaScript Doc artifact</strong>: <code><artifactId>-<version>-doc.<ext></code>
+ <br/> A documentation bundle containing the documentation for the ODataJS library.
<br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><strong>Source artifact</strong>: <code><artifactId>-<version>-sources.<ext></code>
- <br/> A source-release bundle containing all files the sources necessary to build all other artifacts.
+<p><strong>Source artifact</strong>: <code><artifactId>-<version>-sources.<ext></code>
+ <br/> A source-release bundle containing all files the sources necessary to build all other artifacts.
<br/> <strong>Package formats</strong>: zip.</p>
</li>
</ul>
<h3 id="documentation-and-javadoc">Documentation and JavaDoc<a class="headerlink" href="#documentation-and-javadoc" title="Permanent link">¶</a></h3>
-<p>The documentation that will be part of the release must match the code.
-The documentation must be up-to-date. Release independend documentation is
+<p>The documentation that will be part of the release must match the code.
+The documentation must be up-to-date. Release independend documentation is
maintained on the <a href="http://olingo.apache.org/documentation.html">Apache Olingo Documentation</a> page.</p>
<h3 id="preparation">Preparation<a class="headerlink" href="#preparation" title="Permanent link">¶</a></h3>
<h5 id="release-manager">Release Manager<a class="headerlink" href="#release-manager" title="Permanent link">¶</a></h5>
-<p>A release manager must be appointed for a release. He or she is in charge of the release process,
+<p>A release manager must be appointed for a release. He or she is in charge of the release process,
following the guidelines and eventually generating the release artifacts.
The release manager might tailor the process for a specific release.</p>
<h5 id="version">Version<a class="headerlink" href="#version" title="Permanent link">¶</a></h5>
-<p>The Olingo community decides if the release will be a major or a minor release and
+<p>The Olingo community decides if the release will be a major or a minor release and
agrees on a version number.</p>
<p>The artifactnames are build according the following rule:</p>
<p><code>artifactname</code> : '${pkg.name}-${pkg.version}-${pkg.postfix}-${pkg.releaseCandidate}</p>
@@ -144,7 +144,7 @@ agrees on a version number.</p>
<p><em>version</em> is the attribute <code>version</code></p>
<p><em>postfix</em> is the attribute <code>postfix</code></p>
<p><em>isReleaseCandidate</em> is the attribute <code>releaseCandidate</code></p>
-<p>package.json sample: </p>
+<p>package.json sample:</p>
<div class="codehilite"><pre><span class="p">{</span>
"<span class="n">name</span>"<span class="p">:</span> "<span class="n">odatajs</span>"<span class="p">,</span>
"<span class="n">version</span>"<span class="p">:</span> "4<span class="p">.</span>0<span class="p">.</span>0"<span class="p">,</span>
@@ -171,7 +171,7 @@ agrees on a version number.</p>
<p>Release artifacts will be stored in the <code>dist</code> folder parallel to the <code>olingojs</code> folder.</p>
<h5 id="open-issues">Open Issues<a class="headerlink" href="#open-issues" title="Permanent link">¶</a></h5>
-<p>There must not be any open JIRA issues for this release. There might be open issues for
+<p>There must not be any open JIRA issues for this release. There might be open issues for
future releases.</p>
<h5 id="unit-tests-and-integration-tests">Unit Tests and Integration Tests<a class="headerlink" href="#unit-tests-and-integration-tests" title="Permanent link">¶</a></h5>
<p>The QUnit tests in <strong>odata-qunit-tests.htm</strong> tests must succeed on a clean machine with the c#.net testserver running.</p>
@@ -180,7 +180,7 @@ future releases.</p>
<h5 id="apache-license-and-code-style">Apache License and Code Style<a class="headerlink" href="#apache-license-and-code-style" title="Permanent link">¶</a></h5>
-<p>Each source code file must have a current ASF license header. The source
+<p>Each source code file must have a current ASF license header. The source
code should follow the Apache Olingo code style. For verification run following
Maven execution</p>
<div class="codehilite"><pre>``<span class="n">grunt</span> <span class="n">license</span><span class="o">-</span><span class="n">check</span>``
@@ -189,7 +189,7 @@ Maven execution</p>
<h5 id="packaging">Packaging<a class="headerlink" href="#packaging" title="Permanent link">¶</a></h5>
-<p>NOTICE, LICENSE and DISCLAIMER must be present in all bundles and must be up-to-date. </p>
+<p>NOTICE, LICENSE and DISCLAIMER must be present in all bundles and must be up-to-date.</p>
<h5 id="md5-and-sha-for-distribution-packages">MD5 and SHA for distribution packages<a class="headerlink" href="#md5-and-sha-for-distribution-packages" title="Permanent link">¶</a></h5>
<p>MD5 and SHA files are created manually for distribution packages:</p>
<div class="codehilite"><pre>openssl md5 <span class="nt">< </span><span class="cp">${</span><span class="n">filename</span><span class="cp">}</span><span class="nt">.zip</span> <span class="nt">></span> <span class="cp">${</span><span class="n">filename</span><span class="cp">}</span>.zip.md5
@@ -198,30 +198,30 @@ gpg --print-md SHA512 <span class="cp">$
<h5 id="release-tag">Release Tag<a class="headerlink" href="#release-tag" title="Permanent link">¶</a></h5>
-<p>A tag has to be created for every release candidate. The naming rule
-for the tags is olingojs-${version}-${postfix}-RCxx. This is created as
-part of the Maven release process. The tag will be renamed to the
+<p>A tag has to be created for every release candidate. The naming rule
+for the tags is olingojs-${version}-${postfix}-RCxx. This is created as
+part of the Maven release process. The tag will be renamed to the
final version number upon vote approval.</p>
<h5 id="release-branch">Release Branch<a class="headerlink" href="#release-branch" title="Permanent link">¶</a></h5>
-<p>A branch has to be created for every release. The naming rule for this
-branch is olingojs-${version}-${postfix}. This has to be created
+<p>A branch has to be created for every release. The naming rule for this
+branch is olingojs-${version}-${postfix}. This has to be created
manually upon release approval.</p>
<h3 id="release-candidate">Release Candidate<a class="headerlink" href="#release-candidate" title="Permanent link">¶</a></h3>
<p>Once all preparations are done, a release candidate will be built.</p>
-<p>All release candidates must be cryptographically signed. The string
-"-RCxx" will be attached to the version number of the release candidate
-artifacts, where is the number of the release candidate starting with 01.
-If more than one release candidate is required a new tag has to be created
+<p>All release candidates must be cryptographically signed. The string
+"-RCxx" will be attached to the version number of the release candidate
+artifacts, where is the number of the release candidate starting with 01.
+If more than one release candidate is required a new tag has to be created
and release candidate number will be increased by one.</p>
<p>The release candidate artifacts:</p>
<ul>
-<li>Maven artifacts will be staged on repository.apache.org. A new staging repo
+<li>Maven artifacts will be staged on repository.apache.org. A new staging repo
is created per RC and will be communicated upon release.</li>
-<li>Distribution commodity packages are staged at
+<li>Distribution commodity packages are staged at
http://people.apache.org/~[username]/olingo4/js/[version] (e.g. http://people.apache.org/~mibo/olingo4/js/4.0.0-RC01)</li>
</ul>
-<p>Once candidate artifacts are available, release manager kicks off the <a href="http://incubator.apache.org/guides/releasemanagement.html#best-practice-incubator-release-vote">VOTE process</a>.</p>
-<p>If the vote fails, the raised issues will be fixed, a new release candidate will be
+<p>Once candidate artifacts are available, release manager kicks off the [VOTE process][2].</p>
+<p>If the vote fails, the raised issues will be fixed, a new release candidate will be
built and the VOTE process will be restarted.</p>
<p>If the release candidate gets approved, we can proceed to release publishing.</p>
<h4 id="how-to-verify-a-release-candidate">How to verify a Release Candidate<a class="headerlink" href="#how-to-verify-a-release-candidate" title="Permanent link">¶</a></h4>
@@ -236,18 +236,18 @@ built and the VOTE process will be resta
<li>Do all License files contain the right amount of licenses?</li>
<li>Do Notice files mention 3rd party libraries if they are contained in the distribution?</li>
</ul>
-<p>After all questions of this checklist can be answered with yes it is OK to give a +1 on the mailing list.
+<p>After all questions of this checklist can be answered with yes it is OK to give a +1 on the mailing list.
Of course the Release Manager can also use this checklist to make sure all artifacts are correct before publishing the results on the mailing list.</p>
<h3 id="publishing-the-release">Publishing the Release<a class="headerlink" href="#publishing-the-release" title="Permanent link">¶</a></h3>
<p>If the release candidate gets approved, we can proceed to release publishing:</p>
<ul>
<li>Publish final release Version to <a href="https://repository.apache.org/">Apache Repository</a><ul>
<li>Copy the release Artifacts into the <em>Staging Area</em></li>
-<li>From <em>Staging Area</em> close and release the staged Artifacts to finish publishing </li>
+<li>From <em>Staging Area</em> close and release the staged Artifacts to finish publishing</li>
<li>Afterwards the Maven artifacts are automatically synced to <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>.</li>
</ul>
</li>
-<li>Release candidate commodity packages are synced (together with their checksum and
+<li>Release candidate commodity packages are synced (together with their checksum and
signatures) to <a href="http://www.apache.org/dist/olingo/">Apache Distributions</a>.</li>
<li>Release tag is renamed to final version.</li>
<li>Release branch is created.</li>
@@ -263,7 +263,6 @@ signatures) to <a href="http://www.apach
<li><a href="http://www.apache.org/dev/release.html">Releases Policy</a></li>
<li><a href="http://www.apache.org/dev/release-publishing.html">Publishing Releases</a></li>
<li><a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Publishing Maven Artifacts</a></li>
-<li><a href="http://incubator.apache.org/guides/releasemanagement.html">Release Management During Incubation</a></li>
</ul><div align="center">
<p>Copyright © 2013-2015, The Apache Software Foundation<br>
Apache Olingo, Olingo, Apache, the Apache feather, and
Modified: websites/staging/olingo/trunk/content/doc/odata2/download.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/download.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/download.html Mon Oct 5 11:25:34 2015
@@ -100,13 +100,13 @@ h2:hover > .headerlink, h3:hover > .head
<h1 id="download-odata-20-java-library">Download OData 2.0 Java Library<a class="headerlink" href="#download-odata-20-java-library" title="Permanent link">¶</a></h1>
<p>Apache Olingo OData2 is a collection of Java libraries for
implementing <a href="http://odata.org">OData V2</a> protocol clients or servers.</p>
-<h3 id="release-204-2015-05-31">Release 2.0.4 (2015-05-31)<a class="headerlink" href="#release-204-2015-05-31" title="Permanent link">¶</a></h3>
-<p><a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/">Full download page</a>, <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12314520&version=12329640">release notes</a></p>
-<p>The Apache Olingo OData2 2.0.4 release is a patch release.</p>
+<h3 id="release-205-2015-10-05">Release 2.0.5 (2015-10-05)<a class="headerlink" href="#release-205-2015-10-05" title="Permanent link">¶</a></h3>
+<p><a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/">Full download page</a>, <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12314520&version=12332480">release notes</a></p>
+<p>The Apache Olingo OData2 2.0.5 release is a patch release.</p>
<h3 id="commodity-packages">Commodity Packages<a class="headerlink" href="#commodity-packages" title="Permanent link">¶</a></h3>
-<p>The <strong>Olingo Library Core</strong> packages contains the <em>API</em>, the <em>implementation</em>, the <em>documentation as JavaDoc</em> and the <em>Reference Scenario</em>.<br />
-The <em>API</em> and the according <em>implementation</em> can be used in a <em>productive</em> environment.<br />
-The Reference Scenario is a sample and <strong>shall not be used in a productive</strong> environment.<br />
+<p>The <strong>Olingo Library Core</strong> packages contains the <em>API</em>, the <em>implementation</em>, the <em>documentation as JavaDoc</em> and the <em>Reference Scenario</em>.
+The <em>API</em> and the according <em>implementation</em> can be used in a <em>productive</em> environment.
+The Reference Scenario is a sample and <strong>shall not be used in a productive</strong> environment.
The <em>Core Library</em> is developed for the productive usage in business scenarios.</p>
<table class="table">
<thead>
@@ -119,32 +119,32 @@ The <em>Core Library</em> is developed f
<tbody>
<tr>
<td>Olingo OData2 Library</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-dist-lib-2.0.4-lib.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-lib-2.0.4-lib.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-lib-2.0.4-lib.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-lib-2.0.4-lib.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-dist-lib-2.0.5-lib.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-lib-2.0.5-lib.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-lib-2.0.5-lib.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-lib-2.0.5-lib.zip.asc">pgp</a>)</td>
<td>All you need to implement an OData V2 client or server.</td>
</tr>
<tr>
<td>Olingo OData2 Sources</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-parent-2.0.4-source-release.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-parent-2.0.4-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-parent-2.0.4-source-release.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-parent-2.0.4-source-release.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-parent-2.0.5-source-release.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-parent-2.0.5-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-parent-2.0.5-source-release.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-parent-2.0.5-source-release.zip.asc">pgp</a>)</td>
<td>Olingo OData2 source code.</td>
</tr>
<tr>
<td>Olingo OData2 Docs</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-dist-javadoc-2.0.4-javadoc.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-javadoc-2.0.4-javadoc.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-javadoc-2.0.4-javadoc.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-javadoc-2.0.4-javadoc.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-dist-javadoc-2.0.5-javadoc.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-javadoc-2.0.5-javadoc.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-javadoc-2.0.5-javadoc.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-javadoc-2.0.5-javadoc.zip.asc">pgp</a>)</td>
<td>Documentation and JavaDoc.</td>
</tr>
<tr>
<td>Olingo OData2 Reference Scenario</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-dist-ref-2.0.4-ref.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-ref-2.0.4-ref.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-ref-2.0.4-ref.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-ref-2.0.4-ref.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-dist-ref-2.0.5-ref.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-ref-2.0.5-ref.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-ref-2.0.5-ref.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-ref-2.0.5-ref.zip.asc">pgp</a>)</td>
<td>Deployable WAR files with reference scenario services using <a href="http://cxf.apache.org">Apache CXF</a>.</td>
</tr>
</tbody>
</table>
<h5 id="extension-packages">Extension Packages<a class="headerlink" href="#extension-packages" title="Permanent link">¶</a></h5>
-<p>The <strong>Olingo Library Extension</strong> packages contains extensions which are provided from various contributors in the context of the Olingo open source project.<br />
-The extensions provides convenience for easier consumption or creation of an OData service like the <em>JPA based processor</em>, the <em>Java Annotation based processor</em> or the <em>Spring Framework integration</em>.<br />
-However the extensions are <em>not optimized regarding performance or extensibility</em>.<br />
-Interested parties can use the extensions, if they are sufficient for their scenarios in a productive environment.<br />
-Feature enhancements or optimizations of the extensions have to be done by the interested parties itself. </p>
+<p>The <strong>Olingo Library Extension</strong> packages contains extensions which are provided from various contributors in the context of the Olingo open source project.
+The extensions provides convenience for easier consumption or creation of an OData service like the <em>JPA based processor</em>, the <em>Java Annotation based processor</em> or the <em>Spring Framework integration</em>.
+However the extensions are <em>not optimized regarding performance or extensibility</em>.
+Interested parties can use the extensions, if they are sufficient for their scenarios in a productive environment.
+Feature enhancements or optimizations of the extensions have to be done by the interested parties itself.</p>
<table class="table">
<thead>
<tr>
@@ -156,26 +156,28 @@ Feature enhancements or optimizations of
<tbody>
<tr>
<td>Olingo OData2 JPA Processor</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-dist-jpa-2.0.4-jpa.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-jpa-2.0.4-jpa.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-jpa-2.0.4-jpa.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-jpa-2.0.4-jpa.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-dist-jpa-2.0.5-jpa.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-jpa-2.0.5-jpa.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-jpa-2.0.5-jpa.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-jpa-2.0.5-jpa.zip.asc">pgp</a>)</td>
<td>All you need to expose your JPA model as OData service.</td>
</tr>
<tr>
<td>Olingo OData2 Java Annotation Processor</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-dist-janos-2.0.4-janos.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-janos-2.0.4-janos.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-janos-2.0.4-janos.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-dist-janos-2.0.4-janos.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-dist-janos-2.0.5-janos.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-janos-2.0.5-janos.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-janos-2.0.5-janos.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-dist-janos-2.0.5-janos.zip.asc">pgp</a>)</td>
<td>Use Java Annotations to create a simple OData service for e.g. test cases (without persistence).</td>
</tr>
<tr>
<td>Olingo OData2 Spring Extension Sources</td>
-<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.4/olingo-odata2-spring-2.0.4-source-release.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-spring-2.0.4-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-spring-2.0.4-source-release.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.4/olingo-odata2-spring-2.0.4-source-release.zip.asc">pgp</a>)</td>
+<td><a href="http://www.apache.org/dyn/closer.lua/olingo/odata2/rel-2.0.5/olingo-odata2-spring-2.0.5-source-release.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-spring-2.0.5-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-spring-2.0.5-source-release.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.5/olingo-odata2-spring-2.0.5-source-release.zip.asc">pgp</a>)</td>
<td>Support for use of OData library in Spring context.</td>
</tr>
</tbody>
</table>
<h3 id="maven">Maven<a class="headerlink" href="#maven" title="Permanent link">¶</a></h3>
-<p>Apache Olingo OData2 artifacts are available at <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>. For POM dependencies see <a href="/doc/odata2/maven.html">here</a>.</p>
+<p>Apache Olingo OData2 artifacts for latest version at <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.olingo%22%20AND%20v%3A%222.0.5%22">Maven Central</a>.
+For POM dependencies see <a href="/doc/odata2/maven.html">here</a>.</p>
+<p>All other Apache Olingo artifacts are also available at <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>. </p>
<h3 id="older-releases">Older Releases<a class="headerlink" href="#older-releases" title="Permanent link">¶</a></h3>
<p>For older releases please refer to <a href="http://archive.apache.org/dist/olingo/">Archives</a>
-or you can get them <a href="/doc/maven.html">using Maven</a>.</p>
+or you can get them <a href="/doc/odata2/maven.html">using Maven</a>.</p>
<h3 id="verify-authenticity-of-downloads-package">Verify Authenticity of Downloads package<a class="headerlink" href="#verify-authenticity-of-downloads-package" title="Permanent link">¶</a></h3>
<p>While downloading the packages, make yourself familiar
on how to verify their integrity, authenticity and provenience
Modified: websites/staging/olingo/trunk/content/doc/odata2/privacy.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/privacy.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/privacy.html Mon Oct 5 11:25:34 2015
@@ -97,32 +97,32 @@
visibility: hidden;
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="apache-olingo-incubating-privacy">Apache Olingo (Incubating) - Privacy<a class="headerlink" href="#apache-olingo-incubating-privacy" title="Permanent link">¶</a></h1>
-<p>Information about your use of this website is collected
-using server access logs and a tracking cookie. The
+<h1 id="apache-olingo-privacy">Apache Olingo - Privacy<a class="headerlink" href="#apache-olingo-privacy" title="Permanent link">¶</a></h1>
+<p>Information about your use of this website is collected
+using server access logs and a tracking cookie. The
collected information consists of the following:</p>
<ol>
<li>The IP address from which you access the website;</li>
-<li>The type of browser and operating system you use to
+<li>The type of browser and operating system you use to
access our site;</li>
<li>The date and time you access our site;</li>
<li>The pages you visit; and</li>
-<li>The addresses of pages from where you followed a link
+<li>The addresses of pages from where you followed a link
to our site.</li>
</ol>
-<p>Part of this information is gathered using a tracking
-cookie set by the <a href="http://www.google.com/analytics/">Google Analytics</a> service and handled by
-Google as described in their <a href="http://www.google.com/privacy.html">privacy policy</a>. See your
-browser documentation for instructions on how to disable
+<p>Part of this information is gathered using a tracking
+cookie set by the <a href="http://www.google.com/analytics/">Google Analytics</a> service and handled by
+Google as described in their <a href="http://www.google.com/privacy.html">privacy policy</a>. See your
+browser documentation for instructions on how to disable
the cookie if you prefer not to share this data with Google.</p>
-<p>We use the gathered information to help us make our site
-more useful to visitors and to better understand how and
-when our site is used. We do not track or collect
-personally identifiable information or associate gathered
-data with any personally identifying information from
+<p>We use the gathered information to help us make our site
+more useful to visitors and to better understand how and
+when our site is used. We do not track or collect
+personally identifiable information or associate gathered
+data with any personally identifying information from
other sources.</p>
-<p>By using this website, you consent to the collection of
-this data in the manner and for the purpose described
+<p>By using this website, you consent to the collection of
+this data in the manner and for the purpose described
above.</p><div align="center">
<p>Copyright © 2013-2015, The Apache Software Foundation<br>
Apache Olingo, Olingo, Apache, the Apache feather, and
Modified: websites/staging/olingo/trunk/content/doc/odata2/release.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/release.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/release.html Mon Oct 5 11:25:34 2015
@@ -100,18 +100,18 @@ h2:hover > .headerlink, h3:hover > .head
<h1 id="apache-olingo-release-documentation">Apache Olingo Release Documentation<a class="headerlink" href="#apache-olingo-release-documentation" title="Permanent link">¶</a></h1>
<hr />
<h3 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h3>
-<p>This document describes the release guidelines for Apache Olingo. It heavily refers
+<p>This document describes the release guidelines for Apache Olingo. It heavily refers
to <a href="http://maven.apache.org/developers/release/apache-release.html">standard Apache procedures to release</a>
Maven based projects at Apache.</p>
<h3 id="build-environments">Build Environments<a class="headerlink" href="#build-environments" title="Permanent link">¶</a></h3>
-<p>Apache Olingo is built and released with <a href="http://maven.apache.org">Maven3</a> and uses
+<p>Apache Olingo is built and released with <a href="http://maven.apache.org">Maven3</a> and uses
the <a href="http://svn.apache.org/repos/asf/maven/pom/tags/apache-13/pom.xml">Apache POM version 13</a>.</p>
<h3 id="release-artifacts">Release Artifacts<a class="headerlink" href="#release-artifacts" title="Permanent link">¶</a></h3>
<p>An Apache Olingo release consists of:</p>
<ul>
<li>All POMs/JARs/WARs built as part of the standard Maven build process. For
an overview on the released modules see artifacts with groupId
-<em>org.apache.olingo</em> in the <a href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.olingo~~~~">Apache Maven Repository</a>.<br />
+<em>org.apache.olingo</em> in the <a href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.olingo~~~~">Apache Maven Repository</a>.
In detail, per every module, where applicable, the following artifacts are produced:</li>
<li><strong>Main artifact</strong>: <code><artifactId>-<version>.<ext></code></li>
<li><strong>Source artifact</strong>: <code><artifactId>-<version>-sources.<ext></code></li>
@@ -122,43 +122,43 @@ In detail, per every module, where appli
provided as part of the release:</p>
<ul>
<li>
-<p><code>org.apache.olingo-olingo-odata2-parent-${version}-source-release.${ext}</code> <br/> A source-release
+<p><code>org.apache.olingo-olingo-odata2-parent-${version}-source-release.${ext}</code> <br/> A source-release
bundle containing all files the sources necessary to build all other artifacts. <br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><code>org.apache.olingo-olingo-odata2-dist-${version}-lib.${ext}</code> <br/> A bundle containing the OData2 core
+<p><code>org.apache.olingo-olingo-odata2-dist-${version}-lib.${ext}</code> <br/> A bundle containing the OData2 core
library and dependencies required to implement an OData V2 processor. <br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><code>org.apache.olingo-olingo-odata2-dist-${version}-javadoc.${ext}</code> <br/> A bundle
-containing JavaDoc of the OData2 library API and annotations, the
-JPA processor API as well as additional documentation and reference scenario
+<p><code>org.apache.olingo-olingo-odata2-dist-${version}-javadoc.${ext}</code> <br/> A bundle
+containing JavaDoc of the OData2 library API and annotations, the
+JPA processor API as well as additional documentation and reference scenario
examples. <br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><code>org.apache.olingo-olingo-odata2-dist-${version}-jpa.${ext}</code> <br/> A bundle containing the OData2 JPA
+<p><code>org.apache.olingo-olingo-odata2-dist-${version}-jpa.${ext}</code> <br/> A bundle containing the OData2 JPA
processor and dependencies required to implement an OData V2 processor. <br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><code>org.apache.olingo-olingo-odata2-dist-${version}-janos.${ext}</code> <br/> A bundle containing the OData2 Java Annotation
+<p><code>org.apache.olingo-olingo-odata2-dist-${version}-janos.${ext}</code> <br/> A bundle containing the OData2 Java Annotation
processor and dependencies required to implement an OData V2 processor using Java Annotations. <br/> <strong>Package formats</strong>: zip.</p>
</li>
<li>
-<p><code>org.apache.olingo-olingo-odata2-dist-${version}-ref.${ext}</code> <br/> A bundle containing ready-to-depoly WAR
+<p><code>org.apache.olingo-olingo-odata2-dist-${version}-ref.${ext}</code> <br/> A bundle containing ready-to-depoly WAR
files of the OData V2 reference scenarios implementations for the core library and the JPA processor. <br/> <strong>Package formats</strong>: zip.</p>
</li>
</ul>
<h3 id="documentation-and-javadoc">Documentation and JavaDoc<a class="headerlink" href="#documentation-and-javadoc" title="Permanent link">¶</a></h3>
-<p>The documentation that will be part of the release must match the code.
-All examples in the documentation must work. The Java package documentation must be
+<p>The documentation that will be part of the release must match the code.
+All examples in the documentation must work. The Java package documentation must be
up-to-date. Release independend documentation is maintained on the <a href="http://olingo.apache.org/documentation.html">Apache Olingo Documentation</a> page.</p>
<h3 id="preparation">Preparation<a class="headerlink" href="#preparation" title="Permanent link">¶</a></h3>
<h5 id="release-manager">Release Manager<a class="headerlink" href="#release-manager" title="Permanent link">¶</a></h5>
-<p>A release manager must be appointed for a release. He or she is in charge of the release process,
+<p>A release manager must be appointed for a release. He or she is in charge of the release process,
following the guidelines and eventually generating the release artifacts.
The release manager might tailor the process for a specific release.</p>
<h5 id="version">Version<a class="headerlink" href="#version" title="Permanent link">¶</a></h5>
-<p>The Olingo community decides if the release will be a major or a minor release and
+<p>The Olingo community decides if the release will be a major or a minor release and
agrees on a version number.</p>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">versions</span><span class="p">:</span><span class="n">set</span> <span class="o">-</span><span class="n">DnewVersion</span><span class="p">=</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">RC01</span>
<span class="nb">find</span> <span class="p">.</span> <span class="o">-</span><span class="n">name</span> <span class="s">'*.versionsBackup'</span> <span class="o">-</span><span class="n">type</span> <span class="n">f</span> <span class="o">-</span><span class="n">delete</span>
@@ -176,18 +176,18 @@ agrees on a version number.</p>
<h5 id="open-issues">Open Issues<a class="headerlink" href="#open-issues" title="Permanent link">¶</a></h5>
-<p>There must not be any open JIRA issues for this release. There might be open issues for
+<p>There must not be any open JIRA issues for this release. There might be open issues for
future releases. Check with: <a href="https://issues.apache.org/jira/browse/OLINGO/fixforversion/12324804">fix for version view</a></p>
<h5 id="unit-tests-and-integration-tests">Unit Tests and Integration Tests<a class="headerlink" href="#unit-tests-and-integration-tests" title="Permanent link">¶</a></h5>
-<p>All unit tests and integration tests must succeed on a
-clean machine (starting with an empty local Maven repository). The following Maven
+<p>All unit tests and integration tests must succeed on a
+clean machine (starting with an empty local Maven repository). The following Maven
execution will run all unit and integration tests:</p>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span>
</pre></div>
<h5 id="apache-license-and-code-style">Apache License and Code Style<a class="headerlink" href="#apache-license-and-code-style" title="Permanent link">¶</a></h5>
-<p>Each source code file must have a current ASF license header. The source
+<p>Each source code file must have a current ASF license header. The source
code should follow the Apache Olingo code style. For verification run following
Maven execution</p>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Pbuild</span><span class="p">.</span><span class="n">quality</span>
@@ -195,15 +195,15 @@ Maven execution</p>
<h5 id="packaging">Packaging<a class="headerlink" href="#packaging" title="Permanent link">¶</a></h5>
-<p>NOTICE, LICENSE and DISCLAIMER must be present in all bundles and must be up-to-date. </p>
-<p>Remote resources are provided by the ASF and the Maven <code>remote-resources-plugin</code> is
+<p>NOTICE, LICENSE and DISCLAIMER must be present in all bundles and must be up-to-date.</p>
+<p>Remote resources are provided by the ASF and the Maven <code>remote-resources-plugin</code> is
configured in the parent pom of the project.</p>
<div class="codehilite"><pre><span class="nt"><resourceBundle></span>org.apache:apache-jar-resource-bundle:1.4<span class="nt"></resourceBundle></span>
<span class="nt"><resourceBundle></span>org.apache:apache-disclaimer-resource-bundle:1.1<span class="nt"></resourceBundle></span>
</pre></div>
-<p>The Maven module <code>odata2-dist</code> is responsible to package convenience distribution zip files
+<p>The Maven module <code>odata2-dist</code> is responsible to package convenience distribution zip files
using the assembly plugin. The distributions are created with a release build <code>mvn clean install -Papache-release -Dgpg.passphrase="yourPassphraseHere"</code></p>
<h5 id="md5-and-sha-for-distribution-packages">MD5 and SHA for distribution packages<a class="headerlink" href="#md5-and-sha-for-distribution-packages" title="Permanent link">¶</a></h5>
<p>MD5 and SHA files are created manually for distribution packages:</p>
@@ -213,30 +213,30 @@ gpg --print-md SHA512 <span class="cp">$
<h5 id="release-tag">Release Tag<a class="headerlink" href="#release-tag" title="Permanent link">¶</a></h5>
-<p>A tag has to be created for every release candidate. The naming rule
-for the tags is olingo-${version}-RCxx. This is created as
-part of the Maven release process. The tag will be renamed to the
+<p>A tag has to be created for every release candidate. The naming rule
+for the tags is olingo-${version}-RCxx. This is created as
+part of the Maven release process. The tag will be renamed to the
final version number upon vote approval.</p>
<h5 id="release-branch">Release Branch<a class="headerlink" href="#release-branch" title="Permanent link">¶</a></h5>
-<p>A branch has to be created for every release. The naming rule for this
-branch is olingo-${version}. This has to be created
+<p>A branch has to be created for every release. The naming rule for this
+branch is olingo-${version}. This has to be created
manually upon release approval.</p>
<h3 id="release-candidate">Release Candidate<a class="headerlink" href="#release-candidate" title="Permanent link">¶</a></h3>
<p>Once all preparations are done, a release candidate will be built.</p>
-<p>All release candidates must be cryptographically signed. The string
-"-RCxx" will be attached to the version number of the release candidate
-artifacts, where is the number of the release candidate starting with 01.
-If more than one release candidate is required a new tag has to be created
+<p>All release candidates must be cryptographically signed. The string
+"-RCxx" will be attached to the version number of the release candidate
+artifacts, where is the number of the release candidate starting with 01.
+If more than one release candidate is required a new tag has to be created
and release candidate number will be increased by one.</p>
<p>The release candidate artifacts:</p>
<ul>
-<li>Maven artifacts will be staged on repository.apache.org. A new staging repo
+<li>Maven artifacts will be staged on repository.apache.org. A new staging repo
is created per RC and will be communicated upon release.</li>
-<li>Distribution commodity packages are staged at
+<li>Distribution commodity packages are staged at
http://people.apache.org/~[username]/olingo2/[version] (e.g. http://people.apache.org/~mibo/olingo2/2.0.0-RC01)</li>
</ul>
-<p>Once candidate artifacts are available, release manager kicks off the <a href="http://incubator.apache.org/guides/releasemanagement.html#best-practice-incubator-release-vote">VOTE process</a>.</p>
-<p>If the vote fails, the raised issues will be fixed, a new release candidate will be
+<p>Once candidate artifacts are available, release manager kicks off the [VOTE process][3].</p>
+<p>If the vote fails, the raised issues will be fixed, a new release candidate will be
built and the VOTE process will be restarted.</p>
<p>If the release candidate gets approved, we can proceed to release publishing.</p>
<h4 id="how-to-verify-a-release-candidate">How to verify a Release Candidate<a class="headerlink" href="#how-to-verify-a-release-candidate" title="Permanent link">¶</a></h4>
@@ -246,25 +246,25 @@ built and the VOTE process will be resta
<li>Check if md5, sha512 and asc files are filled correctly?</li>
<li>Can the zip files be unpacked without issues?</li>
<li>Execute a "mvn clean install -Pbuild.quality" on parent distribution. It should work without issues.</li>
-<li>Does the JavaDoc only contain API documentation? </li>
+<li>Does the JavaDoc only contain API documentation?</li>
<li>Is there a Disclaimer, Notice, License and Dependencies File in every folder?</li>
<li>Do all License files contain the right amount of licenses?</li>
<li>Do Notice files mention 3rd party libraries if they are contained in the distribution?</li>
</ul>
-<p>After all questions of this checklist can be answered with yes it is OK to give a +1 on the mailing list.
+<p>After all questions of this checklist can be answered with yes it is OK to give a +1 on the mailing list.
Of course the Release Manager can also use this checklist to make sure all artifacts are correct before publishing the results on the mailing list.</p>
<h3 id="publishing-the-release">Publishing the Release<a class="headerlink" href="#publishing-the-release" title="Permanent link">¶</a></h3>
<p>If the release candidate gets approved, we can proceed to release publishing:</p>
<ul>
-<li>Release candidate maven artifacts are promoted in the Apache Maven Repository and
+<li>Release candidate maven artifacts are promoted in the Apache Maven Repository and
made available <a href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.olingo~~~~">here</a>.</li>
<li>Publish final release Version to <a href="https://repository.apache.org/">Apache Repository</a><ul>
<li>First publish via <code>mvn deploy -Papache-release</code> into the <em>Staging Area</em></li>
-<li>From <em>Staging Area</em> close and release the staged Artifacts to finish publishing </li>
+<li>From <em>Staging Area</em> close and release the staged Artifacts to finish publishing</li>
<li>Afterwards the Maven artifacts are automatically synced to <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>.</li>
</ul>
</li>
-<li>Release candidate commodity packages are synced (together with their checksum and
+<li>Release candidate commodity packages are synced (together with their checksum and
signatures) to <a href="http://www.apache.org/dist/olingo/">Apache Distributions</a>.</li>
<li>Release tag is renamed to final version.</li>
<li>Release branch is created.</li>
@@ -280,7 +280,6 @@ signatures) to <a href="http://www.apach
<li><a href="http://www.apache.org/dev/release.html">Releases Policy</a></li>
<li><a href="http://www.apache.org/dev/release-publishing.html">Publishing Releases</a></li>
<li><a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Publishing Maven Artifacts</a></li>
-<li><a href="http://incubator.apache.org/guides/releasemanagement.html">Release Management During Incubation</a></li>
</ul><div align="center">
<p>Copyright © 2013-2015, The Apache Software Foundation<br>
Apache Olingo, Olingo, Apache, the Apache feather, and
Modified: websites/staging/olingo/trunk/content/doc/odata2/tutorials/ExtendingtheEDM.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/tutorials/ExtendingtheEDM.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/tutorials/ExtendingtheEDM.html Mon Oct 5 11:25:34 2015
@@ -101,7 +101,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>The Entity Data Model (EDM) generated from the JPA models can be extended with new Entity Types, Complex Types and also the existing EDM elements can be modified by implementing the interface method <code>org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmExtension.extendJPAEdmSchema</code>.</p>
<p>Link to the code - <a href="https://git-wip-us.apache.org/repos/asf?p=olingo-odata2.git;a=blob;f=odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderProcessingExtension.java;h=3dacd7e727528cb79cb3d4a878ac53d0a4b25277;hb=ecdc476">Support EDM Extension</a></p>
<h4 id="how-to-add-a-complex-type-to-an-edm">How to Add a Complex Type to an EDM<a class="headerlink" href="#how-to-add-a-complex-type-to-an-edm" title="Permanent link">¶</a></h4>
-<p>Consider a scenario where we have a Plain Old Java Object (POJO) in the OrderValue Java class and let us try to transform this POJO into a Complex Type in the EDM. </p>
+<p>Consider a scenario where we have a Plain Old Java Object (POJO) in the OrderValue Java class and let us try to transform this POJO into a Complex Type in the EDM.</p>
<h6 id="pojo-in-ordervalue-java-class">POJO in OrderValue Java Class<a class="headerlink" href="#pojo-in-ordervalue-java-class" title="Permanent link">¶</a></h6>
<div class="codehilite"><pre> <span class="n">public</span> <span class="n">class</span> <span class="n">OrderValue</span>
<span class="p">{</span>
@@ -111,13 +111,13 @@ h2:hover > .headerlink, h3:hover > .head
<span class="n">public</span> <span class="n">double</span> <span class="n">getAmount</span><span class="p">()</span>
- <span class="p">{</span> <span class="k">return</span> <span class="n">amount</span><span class="p">;</span> <span class="p">}</span>
+ <span class="p">{</span> <span class="k">return</span> <span class="n">amount</span><span class="p">;</span> <span class="p">}</span>
<span class="n">public</span> <span class="n">void</span> <span class="n">setAmount</span><span class="p">(</span><span class="n">double</span> <span class="n">amount</span><span class="p">)</span>
- <span class="p">{</span> <span class="n">this</span><span class="p">.</span><span class="n">amount</span> <span class="p">=</span> <span class="n">amount</span><span class="p">;</span> <span class="p">}</span>
+ <span class="p">{</span> <span class="n">this</span><span class="p">.</span><span class="n">amount</span> <span class="p">=</span> <span class="n">amount</span><span class="p">;</span> <span class="p">}</span>
<span class="n">public</span> <span class="n">String</span> <span class="n">getCurrency</span><span class="p">()</span>
- <span class="p">{</span> <span class="k">return</span> <span class="n">currency</span><span class="p">;</span> <span class="p">}</span>
+ <span class="p">{</span> <span class="k">return</span> <span class="n">currency</span><span class="p">;</span> <span class="p">}</span>
<span class="n">public</span> <span class="n">void</span> <span class="n">setCurrency</span><span class="p">(</span><span class="n">String</span> <span class="n">currency</span><span class="p">)</span>
<span class="p">{</span> <span class="n">this</span><span class="p">.</span><span class="n">currency</span> <span class="p">=</span> <span class="n">currency</span><span class="p">;</span> <span class="p">}</span>
@@ -126,7 +126,7 @@ h2:hover > .headerlink, h3:hover > .head
</pre></div>
-<p>Here is an example where the <code>SalesOrderProcessingExtension</code> implements the <code>JPAEdmExtension</code>. </p>
+<p>Here is an example where the <code>SalesOrderProcessingExtension</code> implements the <code>JPAEdmExtension</code>.</p>
<h5 id="sample-code">Sample Code<a class="headerlink" href="#sample-code" title="Permanent link">¶</a></h5>
<div class="codehilite"><pre> <span class="p">@</span><span class="n">Override</span>
<span class="n">public</span> <span class="n">void</span> <span class="n">extendJPAEdmSchema</span><span class="p">(</span><span class="n">final</span> <span class="n">JPAEdmSchemaView</span> <span class="n">view</span><span class="p">)</span> <span class="p">{</span>
@@ -159,7 +159,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>You need to set your <code>JPAEDMExtension</code> type in the <code>initializeODataJPAContext</code> of <code>JPAReferenceServiceFactory</code>.</p>
-<p>The Complex Type added to the EDM can be used as Function Imports Return Type. See <a href="http://olingo.incubator.apache.org/doc/odata2/tutorials/jpafunctionimport.html">Adding Function Imports to OData Services</a> for more information.</p><div align="center">
+<p>The Complex Type added to the EDM can be used as Function Imports Return Type. See <a href="/doc/odata2/tutorials/jpafunctionimport.html">Adding Function Imports to OData Services</a> for more information.</p><div align="center">
<p>Copyright © 2013-2015, 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/odata2/tutorials/debug.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/tutorials/debug.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/tutorials/debug.html Mon Oct 5 11:25:34 2015
@@ -100,20 +100,20 @@ h2:hover > .headerlink, h3:hover > .head
<h1 id="debug-support-and-error-handling">Debug Support and Error Handling<a class="headerlink" href="#debug-support-and-error-handling" title="Permanent link">¶</a></h1>
<hr />
<h3 id="odata-error-conditions">OData Error Conditions<a class="headerlink" href="#odata-error-conditions" title="Permanent link">¶</a></h3>
-<p>OData exposes error conditions as HTTP responses with error status code (4xx and 5xx) and it is in the responsibility of a client to handle this situations. For more details see
+<p>OData exposes error conditions as HTTP responses with error status code (4xx and 5xx) and it is in the responsibility of a client to handle this situations. For more details see
<a href="http://www.odata.org/documentation/odata-version-2-0/operations#ErrorConditions">OData Error Conditions</a>.</p>
<p>In OData the format for error messages is described in <a href="http://www.odata.org/documentation/odata-version-2-0/atom-format/">OData-Atom</a> and <a href="http://www.odata.org/documentation/odata-version-2-0/json-format/">Odata-JSON</a>. Apache Olingo OData2 has implemented this this format for error message.</p>
<h3 id="debug-support">Debug Support<a class="headerlink" href="#debug-support" title="Permanent link">¶</a></h3>
<p>The OData V2 error message format is limited to the HTTP status codes and gives indicators for client errors (status code 4xx) and server errors (5xx). For development and support this is not sufficient because of more technical information is needed for doing a deep error analysis.</p>
-<p>Apache Olingo has implemented a feature to return more error information (stack traces, object states, runtime measurements â¦) within a response to ease the development and support use case. </p>
+<p>Apache Olingo has implemented a feature to return more error information (stack traces, object states, runtime measurements â¦) within a response to ease the development and support use case.</p>
<p>For productive uses cases this feature is by default off. The following explains how to enable the feature and gives options to a service implementation to switch if on and off e.g. role based or by configuration.</p>
<h5 id="debugcallback">DebugCallback<a class="headerlink" href="#debugcallback" title="Permanent link">¶</a></h5>
<p>The debug feature can be enabled by the following callback implementation:</p>
<div class="codehilite"><pre><span class="n">public</span> <span class="n">class</span> <span class="n">MyDebugCallback</span> <span class="n">implements</span> <span class="n">ODataDebugCallback</span> <span class="p">{</span>
<span class="p">@</span><span class="n">Override</span>
- <span class="n">public</span> <span class="n">boolean</span> <span class="n">isDebugEnabled</span><span class="p">()</span> <span class="p">{</span>
+ <span class="n">public</span> <span class="n">boolean</span> <span class="n">isDebugEnabled</span><span class="p">()</span> <span class="p">{</span>
<span class="n">boolean</span> <span class="n">isDebug</span> <span class="p">=</span> â¦<span class="p">;</span> <span class="o">//</span> <span class="n">true</span><span class="o">|</span><span class="n">configuration</span><span class="o">|</span><span class="n">user</span> <span class="n">role</span> <span class="n">check</span>
- <span class="k">return</span> <span class="n">isDebug</span><span class="p">;</span>
+ <span class="k">return</span> <span class="n">isDebug</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">}</span>
</pre></div>
@@ -121,7 +121,7 @@ h2:hover > .headerlink, h3:hover > .head
<h5 id="register-debugcallback">Register DebugCallback<a class="headerlink" href="#register-debugcallback" title="Permanent link">¶</a></h5>
<p>In your service factory (<code>ODataServiceFactory</code>) implement the following method to register the callback:</p>
-<div class="codehilite"><pre><span class="kd">public</span> <span class="o"><</span><span class="n">T</span> <span class="kd">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="o">(</span><span class="kd">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="o">)</span> <span class="o">{</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="o"><</span><span class="n">T</span> <span class="kd">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="o">(</span><span class="kd">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="o">)</span> <span class="o">{</span>
<span class="n">T</span> <span class="n">callback</span>
<span class="nf">if</span> <span class="o">(</span><span class="n">callbackInterface</span><span class="o">.</span><span class="na">isAssignableFrom</span><span class="o">(</span><span class="n">MyDebugCallback</span><span class="o">.</span><span class="na">class</span><span class="o">))</span> <span class="o">{</span>
@@ -194,7 +194,7 @@ h2:hover > .headerlink, h3:hover > .head
<p><strong> HTML Debug View</strong></p>
-<p>Request url: http://localhost:8080/olingo-odata2-ref-web-incubating/ReferenceScenario.svc/?odata-debug=html
+<p>Request url: http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/?odata-debug=html
to get a self-contained HTML document with all information that is in the JSON
output but can be viewed conveniently in a browser.</p>
<h5 id="custom-debug-output">Custom Debug Output<a class="headerlink" href="#custom-debug-output" title="Permanent link">¶</a></h5>
@@ -209,7 +209,7 @@ in a callback method.</p>
<p>which then results in following method</p>
-<div class="codehilite"><pre><span class="kd">public</span> <span class="o"><</span><span class="n">T</span> <span class="kd">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="o">(</span><span class="kd">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="o">)</span> <span class="o">{</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="o"><</span><span class="n">T</span> <span class="kd">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="o">(</span><span class="kd">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="o">)</span> <span class="o">{</span>
<span class="n">T</span> <span class="n">callback</span>
<span class="nf">if</span> <span class="o">(</span><span class="n">callbackInterface</span><span class="o">.</span><span class="na">isAssignableFrom</span><span class="o">(</span><span class="n">MyDebugCallback</span><span class="o">.</span><span class="na">class</span><span class="o">))</span> <span class="o">{</span>
@@ -250,23 +250,23 @@ is requested as described above.</p>
<h5 id="servlet-filter">Servlet Filter<a class="headerlink" href="#servlet-filter" title="Permanent link">¶</a></h5>
<p>For tracing the http traffic (request url, query parameter, http headers, response code â¦) to and from the server it is recommended to implement a servlet filter on top of the service. This is completely independent from the Apache Olingo OData library and has no restrictions.</p>
<h5 id="service-processor-implementation">Service Processor Implementation<a class="headerlink" href="#service-processor-implementation" title="Permanent link">¶</a></h5>
-<p>To trace OData activities (read/write activities) at the server it is recommended to do that within a custom processor implementation. </p>
+<p>To trace OData activities (read/write activities) at the server it is recommended to do that within a custom processor implementation.</p>
<h5 id="error-callback">Error Callback<a class="headerlink" href="#error-callback" title="Permanent link">¶</a></h5>
-<p>Because of OData requires to handle error situations someone can hook into the handling and trace information there. </p>
+<p>Because of OData requires to handle error situations someone can hook into the handling and trace information there.</p>
<p>Simply implement another <code>ODataCallback</code> interface and register it within a <code>ODataServiceFactory</code>.</p>
<p>Callback:</p>
<div class="codehilite"><pre><span class="n">public</span> <span class="n">class</span> <span class="n">MyErrorCallback</span> <span class="n">implements</span> <span class="n">ODataErrorCallback</span> <span class="p">{</span>
<span class="p">@</span><span class="n">Override</span>
- <span class="n">public</span> <span class="n">ODataResponse</span> <span class="n">handleError</span><span class="p">(</span><span class="n">ODataErrorContext</span> <span class="n">context</span><span class="p">)</span> <span class="n">throws</span> <span class="n">ODataApplicationException</span> <span class="p">{</span>
- <span class="n">LOGGER</span><span class="p">.</span><span class="n">severe</span><span class="p">(</span><span class="n">context</span><span class="p">.</span><span class="n">getException</span><span class="p">().</span><span class="n">getClass</span><span class="p">().</span><span class="n">getName</span><span class="p">()</span> <span class="o">+</span> "<span class="p">:</span>" <span class="o">+</span> <span class="n">context</span><span class="p">.</span><span class="n">getMessage</span><span class="p">());</span>
- <span class="k">return</span> <span class="n">EntityProvider</span><span class="p">.</span><span class="n">writeErrorDocument</span><span class="p">(</span><span class="n">context</span><span class="p">);</span>
+ <span class="n">public</span> <span class="n">ODataResponse</span> <span class="n">handleError</span><span class="p">(</span><span class="n">ODataErrorContext</span> <span class="n">context</span><span class="p">)</span> <span class="n">throws</span> <span class="n">ODataApplicationException</span> <span class="p">{</span>
+ <span class="n">LOGGER</span><span class="p">.</span><span class="n">severe</span><span class="p">(</span><span class="n">context</span><span class="p">.</span><span class="n">getException</span><span class="p">().</span><span class="n">getClass</span><span class="p">().</span><span class="n">getName</span><span class="p">()</span> <span class="o">+</span> "<span class="p">:</span>" <span class="o">+</span> <span class="n">context</span><span class="p">.</span><span class="n">getMessage</span><span class="p">());</span>
+ <span class="k">return</span> <span class="n">EntityProvider</span><span class="p">.</span><span class="n">writeErrorDocument</span><span class="p">(</span><span class="n">context</span><span class="p">);</span>
<span class="p">}</span>
<span class="p">}</span>
</pre></div>
<p>Register Callback:</p>
-<div class="codehilite"><pre><span class="n">public</span> <span class="o"><</span><span class="n">T</span> <span class="n">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="p">(</span><span class="n">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="p">)</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="n">public</span> <span class="o"><</span><span class="n">T</span> <span class="n">extends</span> <span class="n">ODataCallback</span><span class="o">></span> <span class="n">T</span> <span class="n">getCallback</span><span class="p">(</span><span class="n">final</span> <span class="n">Class</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="n">callbackInterface</span><span class="p">)</span> <span class="p">{</span>
<span class="n">T</span> <span class="n">callback</span>
<span class="k">if</span> <span class="p">(</span><span class="n">callbackInterface</span><span class="p">.</span><span class="n">isAssignableFrom</span><span class="p">(</span><span class="n">MyDebugCallback</span><span class="p">.</span><span class="n">class</span><span class="p">))</span> <span class="p">{</span>
Modified: websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html Mon Oct 5 11:25:34 2015
@@ -98,35 +98,35 @@
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h1 id="servlet-support">Servlet Support<a class="headerlink" href="#servlet-support" title="Permanent link">¶</a></h1>
-<p>Originally the Olingo OData 2.0 server library has been implemented
+<p>Originally the Olingo OData 2.0 server library has been implemented
based on JAX-RS to take advantage of the REST based CXF features.</p>
-<p>With the development of Olingo URI parser it was possible now also
-to offer a purely servlet-based approach. This has some advantages
-on restricted runtime environments and reduces the amount of
+<p>With the development of Olingo URI parser it was possible now also
+to offer a purely servlet-based approach. This has some advantages
+on restricted runtime environments and reduces the amount of
required dependencies. Disadvantage is that some REST features
which are out of the box are not available.</p>
<p>Both solutions JAX-RS and Non-JAX-RS are supported.</p>
-<p>For testing the feature it is recommended to start with the
-<a href="http://olingo.incubator.apache.org/doc/odata2/sample-setup.html">sample setup</a> using the Olingo archetype and do the following
+<p>For testing the feature it is recommended to start with the
+<a href="/doc/odata2/sample-setup.html">sample setup</a> using the Olingo archetype and do the following
modifications.</p>
<h3 id="maven-dependencies">Maven Dependencies<a class="headerlink" href="#maven-dependencies" title="Permanent link">¶</a></h3>
-<p>For a plain servlet based approach it is possible to exclude JAX-RS
+<p>For a plain servlet based approach it is possible to exclude JAX-RS
dependencies. A simple way is to exclude them with Maven:</p>
<div class="codehilite"><pre><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.olingo<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>olingo-odata2-lib<span class="nt"></artifactId></span>
<span class="nt"><version></span>2.0.4<span class="nt"></version></span>
<span class="nt"><exclusions></span>
- <span class="nt"><exclusion></span>
+ <span class="nt"><exclusion></span>
<span class="nt"><groupId></span>javax.ws.rs<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>javax.ws.rs-api<span class="nt"></artifactId></span>
<span class="nt"></exclusion></span>
- <span class="nt"></exclusions></span>
+ <span class="nt"></exclusions></span>
<span class="nt"></dependency></span>
</pre></div>
-<p>A JAX-RS implementation dependency like Apache CXF is not required
+<p>A JAX-RS implementation dependency like Apache CXF is not required
for runtime.</p>
<h3 id="adopt-webxml">Adopt web.xml<a class="headerlink" href="#adopt-webxml" title="Permanent link">¶</a></h3>
<p>For using the servlet based approach a Servlet must be configured in web.xml file (and probably an old servlet replaced):</p>
Modified: websites/staging/olingo/trunk/content/doc/odata4/release.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/release.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/release.html Mon Oct 5 11:25:34 2015
@@ -109,8 +109,8 @@ the <a href="http://svn.apache.org/repos
<h3 id="release-artifacts">Release Artifacts<a class="headerlink" href="#release-artifacts" title="Permanent link">¶</a></h3>
<p>An Apache Olingo release consists of:</p>
<ul>
-<li>The main POMs/JARs/WARs built as part of the Maven build process.<br />
- For an overview on the released modules see artifacts with <em>groupId</em>: <code>org.apache.olingo</code> in the <a href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.olingo~~4.0.0~~">Apache Maven Repository</a>.<br />
+<li>The main POMs/JARs/WARs built as part of the Maven build process.
+ For an overview on the released modules see artifacts with <em>groupId</em>: <code>org.apache.olingo</code> in the <a href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.olingo~~4.0.0~~">Apache Maven Repository</a>.
In detail the following artifacts are produced for each release module:<ul>
<li><strong>Main artifact</strong>: <code><artifactId>-<version>.<ext></code></li>
<li><strong>Source artifact</strong>: <code><artifactId>-<version>-sources.<ext></code></li>
@@ -221,7 +221,7 @@ is created per RC and will be communicat
<li>Distribution commodity packages are staged at
http://people.apache.org/~[username]/olingo2/[version] (e.g. http://people.apache.org/~mibo/olingo4/4.0.0-RC01)</li>
</ul>
-<p>Once candidate artifacts are available, release manager kicks off the <a href="http://incubator.apache.org/guides/releasemanagement.html#best-practice-incubator-release-vote">VOTE process</a>.</p>
+<p>Once candidate artifacts are available, release manager kicks off the [VOTE process][3].</p>
<p>If the vote fails, the raised issues will be fixed, a new release candidate will be
built and the VOTE process will be restarted.</p>
<p>If the release candidate gets approved, we can proceed to release publishing.</p>
@@ -266,7 +266,6 @@ signatures) to <a href="http://www.apach
<li><a href="http://www.apache.org/dev/release.html">Releases Policy</a></li>
<li><a href="http://www.apache.org/dev/release-publishing.html">Publishing Releases</a></li>
<li><a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Publishing Maven Artifacts</a></li>
-<li><a href="http://incubator.apache.org/guides/releasemanagement.html">Release Management During Incubation</a></li>
</ul><div align="center">
<p>Copyright © 2013-2015, The Apache Software Foundation<br>
Apache Olingo, Olingo, Apache, the Apache feather, and
Modified: websites/staging/olingo/trunk/content/sitemap.html
==============================================================================
--- websites/staging/olingo/trunk/content/sitemap.html (original)
+++ websites/staging/olingo/trunk/content/sitemap.html Mon Oct 5 11:25:34 2015
@@ -98,7 +98,7 @@
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<ul>
-<li><a href="/">Apache Olingo (Incubating)</a></li>
+<li><a href="/">Apache Olingo</a></li>
<li><a href="/documentation.html">Documentation</a></li>
<li><a href="/documentation2.html"></a></li>
<li><a href="/download.html"></a></li>