Author: desruisseaux
Date: Thu Apr 21 22:22:55 2016
New Revision: 1740421
URL: http://svn.apache.org/viewvc?rev=1740421&view=rev
Log:
Documentation about MBeans disabled on trunk but enabled on branches.
Safety against a discrepancy between older and newer ISO 19111 model.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 21 22:22:55 2016
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1740391
-/sis/branches/JDK8:1584960-1740312
+/sis/branches/JDK7:1394913-1740420
+/sis/branches/JDK8:1584960-1740419
/sis/trunk:1394364-1508466,1519089-1519674
Modified:
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/package-info.java?rev=1740421&r1=1740420&r2=1740421&view=diff
==============================================================================
---
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] Thu Apr 21 22:22:55 2016
@@ -20,8 +20,9 @@
* See {@link org.apache.sis.console.Command} for the list of supported
commands.
*
* <div class="section">SIS installation on remote machines</div>
- * Some sub-commands can operate on SIS installation on remote machines,
provided
- * that the remote Java Virtual Machine has been started with the following
options:
+ * Some sub-commands can operate on SIS installation on remote machines,
provided that Apache SIS
+ * has been <a href="http://sis.apache.org/branches.html#trunk";>compiled with
MBeans enabled</a>
+ * and that the remote Java Virtual Machine has been started with the
following options:
*
* {@preformat shell
* java -Dcom.sun.management.jmxremote.port=1099 \
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java?rev=1740421&r1=1740420&r2=1740421&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java
[UTF-8] Thu Apr 21 22:22:55 2016
@@ -90,8 +90,17 @@ public final class CC_CoordinateOperatio
*/
public void setElement(final AbstractCoordinateOperation operation) {
metadata = operation;
- if ((operation instanceof PassThroughOperation) &&
((PassThroughOperation) operation).getOperation() == null) {
- incomplete("coordOperation");
+ /*
+ * In an older ISO 19111 model, PassThroughOperation extended
SingleOperation.
+ * It was forcing us to provide a dummy value or null for the 'method'
property.
+ * This has been fixed in newer ISO 19111 model, but for safety with
object following the older model
+ * (e.g. when using GeoAPI 3.0) we are better to skip the check for
the SingleOperation case when the
+ * operation is a PassThroughOperation.
+ */
+ if (operation instanceof PassThroughOperation) {
+ if (((PassThroughOperation) operation).getOperation() == null) {
+ incomplete("coordOperation");
+ }
} else if ((operation instanceof SingleOperation) &&
((SingleOperation) operation).getMethod() == null) {
incomplete("method");
}
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java?rev=1740421&r1=1740420&r2=1740421&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
[UTF-8] Thu Apr 21 22:22:55 2016
@@ -122,8 +122,8 @@ public class DefaultCoordinateOperationF
/**
* Weak references to existing objects.
* This set is used in order to return a pre-existing object instead of
creating a new one.
- * This apply to object created explicitly, not to coordinate operations
inferred by a call
- * to {@link #createOperation(CoordinateReferenceSystem,
CoordinateReferenceSystem)}.
+ * This applies to objects created explicitly, not to coordinate
operations inferred by a
+ * call to {@link #createOperation(CoordinateReferenceSystem,
CoordinateReferenceSystem)}.
*/
private final WeakHashSet<IdentifiedObject> pool;
Modified:
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java?rev=1740421&r1=1740420&r2=1740421&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] Thu Apr 21 22:22:55 2016
@@ -58,6 +58,8 @@ public final class Supervisor extends St
/**
* Whatever JMX agent is enabled. Setting this variable to {@code false}
allows the
* Java compiler to omit any dependency to this {@code Supervisor} class.
+ *
+ * @see <a href="http://sis.apache.org/branches.html#trunk";>Differences
between SIS trunk and branches</a>
*/
static final boolean ENABLED = true;
Modified:
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java?rev=1740421&r1=1740420&r2=1740421&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
[UTF-8] Thu Apr 21 22:22:55 2016
@@ -42,6 +42,8 @@ public final class TemporalUtilities ext
* until we can really provide a sis-temporal module.
*
* This constant will be removed after SIS release a sis-temporal module.
+ *
+ * @see <a href="http://sis.apache.org/branches.html#trunk";>Differences
between SIS trunk and branches</a>
*/
public static final boolean REPORT_MISSING_MODULE = true;
