SVN merge info.

git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1492286 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info together with post-merge adjustments.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492294 13f79535-47bb-0310-9956-ffa450edef68
More consistent contract for the 'About.configuration(...)' methods.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492576 13f79535-47bb-0310-9956-ffa450edef68
Replaced usage of the deprecated "bgbackground" HTML attribute by the "style" one.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492664 13f79535-47bb-0310-9956-ffa450edef68
Some cleaning in MonolineFormatter.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492763 13f79535-47bb-0310-9956-ffa450edef68
Fixed NullPointerException.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492765 13f79535-47bb-0310-9956-ffa450edef68
Simplified install() and added test case.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1492886 13f79535-47bb-0310-9956-ffa450edef68
Enabled support for ISO 19139 XML output on the command-line.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493029 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1493035 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1493038 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1493057 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info, together with post-merge correction.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493059 13f79535-47bb-0310-9956-ffa450edef68
Moved the class that perform a system-wide service to the internal "system" package.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493109 13f79535-47bb-0310-9956-ffa450edef68
Replaced JCIP dependency by our own @Immutable and @ThreadSafe annotation for documentation purpose only.
The intend is to avoid a trivial dependency which is very easy to avoid, to avoid the Retention.RUNTIME
(we use Retention.SOURCE instead), and also because we noticed that some NetCDF library versions (at least
the first mavenified ones) were bundling a copy of JCIP in their JAR, which was a potential source of conflict
(probably harmless in practice).


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493150 13f79535-47bb-0310-9956-ffa450edef68
Added a few missing @Debug annotations for documentation purpose.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493163 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1493167 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1493175 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1493178 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493191 13f79535-47bb-0310-9956-ffa450edef68
OSGi configuration: unregister listeners of undeployed modules.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1493263 13f79535-47bb-0310-9956-ffa450edef68