sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1031479 - in /websites/staging/sis/trunk/content: ./ branches.html command-line.html source.html
Date Tue, 19 Jun 2018 16:52:03 GMT
Author: buildbot
Date: Tue Jun 19 16:52:03 2018
New Revision: 1031479

Log:
Staging update by buildbot for sis

Modified:
    websites/staging/sis/trunk/content/   (props changed)
    websites/staging/sis/trunk/content/branches.html
    websites/staging/sis/trunk/content/command-line.html
    websites/staging/sis/trunk/content/source.html

Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 19 16:52:03 2018
@@ -1 +1 @@
-1832804
+1833858

Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Tue Jun 19 16:52:03 2018
@@ -98,19 +98,19 @@
   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>
-<p>The <a href="source.html">source code repository</a> contains JDK8 and
JDK9 branches together with the trunk.
-The Apache SIS releases are created from the code on the trunk only.
-However the actual development often occur on a branch before to be merged to the trunk.
-Those branches exist in order to experiment early the new technologies — since it may
impact
-the library design — while keeping the releases compatible with more common environments.</p>
-<p>This page lists the Apache SIS development branches, provides some coding recommendations
-for making merges easier, then provides the steps to follow for performing the merges.</p>
+<p>The <a href="source.html">source code repository</a> contains <code>"geoapi-3.1"</code>
and <code>"geoapi-4.0"</code> branches in addition of <code>master</code>.
+The Apache SIS releases are created from the code on <code>master</code> only.
+However the actual development occurs on the <code>"geoapi-4.0"</code> branch
before to be merged to <code>master</code>.
+Those branches exist in order to experiment early new API and technologies — since it
may impact
+the library design — while keeping the releases compatible with officially released
environments.
+This page describes the Apache SIS development branches and provides some coding recommendations
+for making merges easier.</p>
 <div class="toc">
 <ul>
 <li><a href="#development">The development branches</a><ul>
-<li><a href="#jdk9">branches/JDK9</a></li>
-<li><a href="#jdk8">branches/JDK8</a></li>
-<li><a href="#trunk">trunk</a><ul>
+<li><a href="#geoapi-4.0">GeoAPI 4.0 branch</a></li>
+<li><a href="#geoapi-3.1">GeoAPI 3.1 branch</a></li>
+<li><a href="#master">master</a><ul>
 <li><a href="#behavior">Behavioral differences</a></li>
 </ul>
 </li>
@@ -122,28 +122,30 @@ for making merges easier, then provides
 <li><a href="#substitutions">Substitution for non-existent classes</a></li>
 </ul>
 </li>
-<li><a href="#merges">Performing the merges</a><ul>
-<li><a href="#merge-two-branches">Merging changes between two branches</a></li>
-<li><a href="#merge-record-only">Declaring that some changes shall not be merged</a></li>
-</ul>
-</li>
 </ul>
 </div>
 <h1 id="development">The development branches<a class="headerlink" href="#development"
title="Permanent link">&para;</a></h1>
-<p>Users who want stability are encouraged to build from the trunk.
-Developers who want to contribute to Apache SIS are encouraged to use the JDK8 branch for
now.
-We plan to switch SIS development to the JDK9 branch later, but the schedule is not yet determined.</p>
-<h2 id="jdk9">branches/JDK9<a class="headerlink" href="#jdk9" title="Permanent link">&para;</a></h2>
-<p>The JDK9 branch is an experimental branch for migration to Jigsaw modules.
-It may become the main SIS development branch later, but the schedule is not yet determined.</p>
-<h2 id="jdk8">branches/JDK8<a class="headerlink" href="#jdk8" title="Permanent link">&para;</a></h2>
-<p>The JDK8 branch is the recommended development branch for now.
-This branch implements the interfaces defined in the <a href="http://www.geoapi.org/snapshot/index.html">GeoAPI
snapshot</a> milestones.
-The JDK8 branch implements the same GeoAPI interfaces than the JDK9 branch.</p>
-<h2 id="trunk">trunk<a class="headerlink" href="#trunk" title="Permanent link">&para;</a></h2>
-<p>The trunk is a merge of the JDK8 branch ported to the interfaces defined by the
<a href="http://www.geoapi.org/3.0/index.html">GeoAPI stable release</a>.
+<p>Users who want stability are encouraged to build from the <code>master</code>.
+The master depends on GeoAPI 3.0.1,
+which is the <a href="http://www.geoapi.org/3.0/index.html">latest GeoAPI</a>
released by the Open Geospatial Consortium (OGC).
+Developers who want to contribute to Apache SIS are encouraged to use the <code>geoapi-4.0</code>
branch for now.</p>
+<h2 id="geoapi-4.0">GeoAPI 4.0 branch<a class="headerlink" href="#geoapi-4.0" title="Permanent
link">&para;</a></h2>
+<p>The <code>geoapi-4.0</code> branch is the recommended development branch
for now.
+This branch implements the interfaces defined in GeoAPI 4.0 snapshot milestones.
+This branch uses new interfaces introduced in GeoAPI 4.0-SNAPSHOT and contains upgrades for
changes in existing GeoAPI interfaces.
+Some changes in GeoAPI 4.0-SNAPSHOT interfaces are incompatible with GeoAPI 3.0.1 interfaces.
+They are caused by changes in the underlying international standards, or by evolution of
Java technology.
+The content of this branch may be fully merged to <code>master</code> in the
future, depending on new GeoAPI releases from OGC.</p>
+<h2 id="geoapi-3.1">GeoAPI 3.1 branch<a class="headerlink" href="#geoapi-3.1" title="Permanent
link">&para;</a></h2>
+<p>The <code>geoapi-3.1</code> branch implements the interfaces defined
in <a href="http://www.geoapi.org/snapshot/index.html">GeoAPI 3.1 snapshot</a>
milestones.
+It has the same content that the <code>geoapi-4.0</code> branch, excluding changes
that are incompatible with GeoAPI 3.0.
+Developments happen on <code>geoapi-4.0</code> and are periodically merged to
<code>geoapi-3.1</code> with the necessary modifications.
+This branch is used merely as an intermediate step between the <code>geoapi-4.0</code>
branch and <code>master</code>.
+Its content may be fully merged to <code>master</code> in the future, after new
GeoAPI releases from OGC.</p>
+<h2 id="master">master<a class="headerlink" href="#master" title="Permanent link">&para;</a></h2>
+<p>The master is a merge of <code>geoapi-3.1</code> branch ported to the
interfaces defined by the <a href="http://www.geoapi.org/3.0/index.html">GeoAPI stable
release</a>.
 This is the code which is built by the continuous integration system and deployed on the
Maven repository.
-The main differences (apart version number) compared to the JDK8 branch are the modifications
+The main differences (apart version number) compared to above-cited branches are the modifications
 necessary for implementing an older version of the GeoAPI interfaces:</p>
 <ul>
 <li>
@@ -152,11 +154,11 @@ necessary for implementing an older vers
 </li>
 <li>
 <p>When a new revision of a standard is available,
-    the trunk still uses the old version since the new revision is not available in GeoAPI
3.0.
+    the master still uses the old version since the new revision is not available in GeoAPI
3.0.
     Sometime it results in usage of methods that are deprecated on the SIS development branches.</p>
 </li>
 </ul>
-<p>For security reasons and for avoiding misleading information, the following functionalities
are disabled on trunk
+<p>For security reasons and for avoiding misleading information, the following functionalities
are disabled on master
 (but are still enabled on branches as experimental features). In particular the <code>Supervisor.ENABLED</code>
flag controls
 whether the MBeans documented in the <code>org.apache.sis.console</code> package
are enabled or not.</p>
 <ul>
@@ -168,7 +170,7 @@ whether the MBeans documented in the <co
 <p>Because of changes between GeoAPI 3.0 and GeoAPI 4.0-SNAPSHOT, the following aspects
need special care:</p>
 <ul>
 <li>If <code>op</code> is an instance of <code>PassThroughOperation</code>,
then the <code>if (op instanceof SingleOperation)</code> expression
-    evaluates to <code>true</code> on trunk but to <code>false</code>
on SIS development branches.</li>
+    evaluates to <code>true</code> on master but to <code>false</code>
on SIS development branches.</li>
 </ul>
 <h1 id="recommendations">Coding recommendations<a class="headerlink" href="#recommendations"
title="Permanent link">&para;</a></h1>
 <p>The following recommendations aim to make the merges easier by reducing the extend
of potential conflicts.</p>
@@ -197,71 +199,6 @@ conflicts with the platform-dependent im
 <code>org.apache.sis.internal</code> sub-package with the minimal amount of needed
functionalities,
 provided that it can be done with reasonable effort. Otherwise just delete the JDK9-dependent
 code from the JDK8 branch.</p>
-<h1 id="merges">Performing the merges<a class="headerlink" href="#merges" title="Permanent
link">&para;</a></h1>
-<p>Subversion 1.5 and later maintain a <code>svn:mergeinfo</code> property
which make merge operations much easier.
-In order to get those merge information properly maintained, no merge operation shall be
performed
-with older Subversion tools.</p>
-<h2 id="merge-two-branches">Merging changes between two branches<a class="headerlink"
href="#merge-two-branches" title="Permanent link">&para;</a></h2>
-<p>The branches and trunk checkout directories can be located anywhere on the developer
machine.
-The following example assumes that the current directory contains the following sub-directories:</p>
-<ul>
-<li><code>JDK8</code> as a checkout of <code>http://svn.apache.org/repos/asf/sis/branches/JDK8</code>.</li>
-<li><code>JDK9</code> as a checkout of <code>http://svn.apache.org/repos/asf/sis/branches/JDK9</code>.</li>
-</ul>
-<p>However the instructions below can be adapted to different directory locations by
changing
-the paths given in argument to the <code>cd</code> and <code>svn merge</code>
commands.</p>
-<p>Assuming that the developer wants to merge the changes <em>from</em>
the JDK9 directory <em>to</em> the JDK8 directory,
-then the following commands can be executed.
-Do <strong>not</strong> specify any revision number to the <code>svn merge</code>
command.
-Instead, let Subversion infers the proper revisions range from the <code>svn:mergeinfo</code>
property.</p>
-<div class="codehilite"><pre><span class="nb">cd </span>JDK9
-svn update
-<span class="nb">cd</span> ../JDK8
-svn update
-svn merge ../JDK9
-</pre></div>
-
-
-<p>If Subversion reports any conflicts (flagged by the <code>C</code> letter
before the file names),
-then edit the conflicted files in any IDE and mark them as resolved:</p>
-<div class="codehilite"><pre>svn resolved path/to/the/resolved/file
-</pre></div>
-
-
-<p>Clean the workspace and test the build. We suggest to execute the Maven commands
in the following order,
-since <code>mvn compile</code> will find compilation problems much faster than
<code>mvn install</code>.
-If any of those commands fail, edit the files at cause and re-try from the command that failed
-(there is usually no need to run <code>mvn clean</code> again).</p>
-<div class="codehilite"><pre>mvn clean
-mvn compile
-mvn <span class="nb">test</span>-compile
-mvn install
-</pre></div>
-
-
-<p>After a successful build, commit:</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Merge
from the JDK9 branch.&quot;</span>
-</pre></div>
-
-
-<h2 id="merge-record-only">Declaring that some changes shall not be merged<a class="headerlink"
href="#merge-record-only" title="Permanent link">&para;</a></h2>
-<p>If a developers wants to apply some changes specific to the JDK9 platform and tells
-Subversion to not propagate those changes to the JDK8 branch, then the following
-procedure shall be applied:</p>
-<ul>
-<li>Before to apply JDK9-specific changes, merge any pending changes to the JDK8 branch.</li>
-<li>Apply the JDK9-specific changes and commit.</li>
-<li>Run the following commands (edit the path arguments if the directory layout is
different
-    than the example from the previous section):</li>
-</ul>
-<p>Commands:</p>
-<div class="codehilite"><pre><span class="nb">cd </span>JDK9
-svn update
-<span class="nb">cd</span> ../JDK8
-svn update
-svn merge --record-only ../JDK9
-svn commit --message <span class="s2">&quot;Skip JDK9-specific changes.&quot;</span>
-</pre></div>
             </article>
           </section>
         </div><!--/span-->

Modified: websites/staging/sis/trunk/content/command-line.html
==============================================================================
--- websites/staging/sis/trunk/content/command-line.html (original)
+++ websites/staging/sis/trunk/content/command-line.html Tue Jun 19 16:52:03 2018
@@ -447,7 +447,7 @@ or Moving Features CSV files can be give
 </blockquote>
 
 <p>The following example show the metadata of a netCDF file accessible from the web:</p>
-<div class="codehilite"><pre>sis metadata https://github.com/opengeospatial/geoapi/raw/master/geoapi-netcdf/src/test/resources/org/opengis/wrapper/netcdf/NCEP-SST.nc
+<div class="codehilite"><pre>sis metadata https://github.com/opengeospatial/geoapi/raw/master/geoapi-conformance/src/main/resources/org/opengis/test/dataset/Cube4D_projected_float.nc
 </pre></div>
 
 

Modified: websites/staging/sis/trunk/content/source.html
==============================================================================
--- websites/staging/sis/trunk/content/source.html (original)
+++ websites/staging/sis/trunk/content/source.html Tue Jun 19 16:52:03 2018
@@ -98,23 +98,15 @@
   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>
-<p>Apache SIS source code is maintained using Apache Subversion version control, and
mirrored on Git.
-For browsing the source code on-line, see <a href="http://svn.apache.org/viewvc/sis/">ViewVC</a>.
-For fetching the source code, choose one of the following commands:</p>
-<p><a href="http://subversion.apache.org">Subversion</a>:</p>
-<div class="codehilite"><pre>svn checkout https://svn.apache.org/repos/asf/sis/trunk
sis
-svn checkout https://svn.apache.org/repos/asf/sis/data/non-free
-</pre></div>
-
-
-<p><a href="http://git-scm.com">Git</a> (read-only mirror of Subversion
repository):</p>
-<div class="codehilite"><pre>git clone git://git.apache.org/sis.git sis
+<p>Apache SIS source code is maintained using <a href="http://git-scm.com">Git</a>
version control.
+For fetching the source code, use the following commands:</p>
+<div class="codehilite"><pre>git clone https://gitbox.apache.org/repos/asf/sis.git
 </pre></div>
 
 
 <p>The above Git repository is mirrored on GitHub at <a href="https://github.com/apache/sis">https://github.com/apache/sis</a>.
 Note that the git repository does not include the non-free data (in particular the <a
href="epsg.html">EPSG geodetic dataset</a>).
-Those data are currently provided only on Subversion.</p>
+Those data are currently provided only on Subversion repository.</p>
 <p>The remaining of this page gives some guidelines about the way SIS source code is
organized.</p>
 <div class="toc">
 <ul>
@@ -145,18 +137,17 @@ Those data are currently provided only o
 </ul>
 </div>
 <h1 id="ide">Opening Apache SIS in an IDE<a class="headerlink" href="#ide" title="Permanent
link">&para;</a></h1>
-<p>Different SIS branches are available depending on the target platforms (JDK8 versus
JDK9, or GeoAPI versions).
+<p>Different SIS branches are available depending on the GeoAPI versions.
 The alternatives are listed in the <a href="branches.html">branches page</a>.
 One thing to take in consideration can be summarized as below:</p>
 <ul>
-<li>There is no need to build GeoAPI prior working on SIS trunk.</li>
+<li>There is no need to build GeoAPI prior working on SIS master.</li>
 <li>When working on a SIS development branch, we recommend to build GeoAPI 4.0-SNAPSHOT
locally first.</li>
 </ul>
-<p>This section documents how to checkout the trunk for development with Subversion.</p>
 <p>While the primarily SIS build system is Maven, the project provides some IDE configuration
files for developers convenience.
 Before opening the project in an IDE, the source code needs to be downloaded from the source
repository
 and the project built at least once using Maven:</p>
-<div class="codehilite"><pre>svn checkout http://svn.apache.org/repos/asf/sis/trunk
sis
+<div class="codehilite"><pre>git clone https://gitbox.apache.org/repos/asf/sis.git
 <span class="nb">cd </span>sis
 mvn install
 </pre></div>



Mime
View raw message