You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/10/09 22:22:19 UTC
svn commit: r1707808 - in /sis/branches/JDK6: ./ application/sis-webapp/
core/sis-build-helper/
core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/
core/sis-build-helper/src/main/java/org/apache/sis/util/resources/
core/sis-metadata/src/...
Author: desruisseaux
Date: Fri Oct 9 20:22:18 2015
New Revision: 1707808
URL: http://svn.apache.org/viewvc?rev=1707808&view=rev
Log:
Merge miscellaneous cleanup tasks from JDK7 branch.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/application/sis-webapp/pom.xml
sis/branches/JDK6/core/sis-build-helper/pom.xml
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
sis/branches/JDK6/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 9 20:22:18 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1707575
-/sis/branches/JDK8:1584960-1707574
+/sis/branches/JDK7:1394913-1707802
+/sis/branches/JDK8:1584960-1707800
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK6/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-webapp/pom.xml?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK6/application/sis-webapp/pom.xml Fri Oct 9 20:22:18 2015
@@ -82,13 +82,14 @@
<configuration>
<stopKey>stopJetty</stopKey>
<stopPort>${stopPort}</stopPort>
+ <stopWait>4</stopWait>
</configuration>
<executions>
<execution>
<id>start-jetty</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run</goal>
+ <goal>start</goal>
</goals>
<configuration>
<connectors>
@@ -96,7 +97,7 @@
<port>${jettyPort}</port>
</connector>
</connectors>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
<daemon>true</daemon>
<systemProperties>
<systemProperty>
Modified: sis/branches/JDK6/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/pom.xml?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/pom.xml Fri Oct 9 20:22:18 2015
@@ -82,20 +82,46 @@ Define Maven Mojos and Javadoc taglets f
<!-- ===========================================================
+ Build configuration for annotation processing
+ =========================================================== -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.3</version> <!-- Last version compatible with JDK6 -->
+ <executions>
+ <execution>
+ <id>default-descriptor</id>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <!-- ===========================================================
Dependencies
=========================================================== -->
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.1.1</version>
+ <version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.1.1</version>
+ <version>3.3.3</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>0.0.7</version>
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -23,6 +23,9 @@ import java.io.FileInputStream;
import java.io.FilterOutputStream;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.project.MavenProject;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -46,29 +49,22 @@ import static org.apache.sis.internal.ma
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.4
- * @version 0.4
+ * @version 0.7
* @module
- *
- * @goal dist
- * @phase install
*/
+@Mojo(name = "dist", defaultPhase = LifecyclePhase.INSTALL)
public class Assembler extends AbstractMojo implements FilenameFilter {
/**
* Project information (name, version, URL).
- *
- * @parameter property="project"
- * @required
- * @readonly
*/
+ @Parameter(property="project", required=true, readonly=true)
private MavenProject project;
/**
* The root directory (without the "<code>target/binaries</code>" sub-directory) where JARs
* are to be copied. It should be the directory of the root <code>pom.xml</code>.
- *
- * @parameter property="session.executionRootDirectory"
- * @required
*/
+ @Parameter(property="session.executionRootDirectory", required=true)
private String rootDirectory;
/**
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -20,6 +20,9 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.project.MavenProject;
import static org.apache.sis.internal.maven.Filenames.*;
@@ -40,29 +43,22 @@ import static org.apache.sis.internal.ma
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.4
+ * @version 0.7
* @module
- *
- * @goal pack
- * @phase install
*/
+@Mojo(name = "pack", defaultPhase = LifecyclePhase.INSTALL)
public class BundleCreator extends AbstractMojo {
/**
* Project information (name, version, URL).
- *
- * @parameter property="project"
- * @required
- * @readonly
*/
+ @Parameter(property="project", required=true, readonly=true)
private MavenProject project;
/**
* The root directory (without the "<code>target/binaries</code>" sub-directory) where JARs
* are to be copied. It should be the directory of the root <code>pom.xml</code>.
- *
- * @parameter property="session.executionRootDirectory"
- * @required
*/
+ @Parameter(property="session.executionRootDirectory", required=true)
private String rootDirectory;
/**
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -35,7 +35,7 @@ import java.io.IOException;
final class Filenames {
/**
* The target directory. This directory name is hard-coded instead than using a property annotated
- * by {@code @parameter default-value="${project.build.directory}"} - or alternatively by invoking
+ * by {@code @Parameter(defaultValue="${project.build.directory}")} - or alternatively by invoking
* {@code MavenProject.getModel().getBuild().getDirectory()}, because we need the target directory
* of the project root rather than the directory of the module being built.
*/
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -27,6 +27,10 @@ import java.util.Set;
import java.util.LinkedHashSet;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.Artifact;
@@ -41,30 +45,24 @@ import static org.apache.sis.internal.ma
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.3
+ * @version 0.7
* @module
- *
- * @goal collect-jars
- * @phase package
- * @requiresDependencyResolution runtime
*/
+@Mojo(name = "collect-jars",
+ defaultPhase = LifecyclePhase.PACKAGE,
+ requiresDependencyResolution = ResolutionScope.RUNTIME)
public final class JarCollector extends AbstractMojo implements FileFilter {
/**
* The Maven project running this plugin.
- *
- * @parameter property="project"
- * @required
- * @readonly
*/
+ @Parameter(property="project", required=true, readonly=true)
private MavenProject project;
/**
* The root directory (without the "<code>target/binaries</code>" sub-directory) where JARs
* are to be copied. It should be the directory of the root <code>pom.xml</code>.
- *
- * @parameter property="session.executionRootDirectory"
- * @required
*/
+ @Parameter(property="session.executionRootDirectory", required=true)
private String rootDirectory;
/**
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
* For now we keep it package-private, but we could consider to enable execution from
* the command-line in a future version if this happen to be useful.</p>
*
- * @author Martin Desruisseaux (IRD, Geomatys)
+ * @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3
* @version 0.3
* @module
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -22,7 +22,7 @@ import org.apache.maven.plugin.MojoExecu
/**
* Thrown when the {@link ResourceCompilerMojo} exit abnormally.
*
- * @author Martin Desruisseaux (Geomatys)
+ * @author Martin Desruisseaux (Geomatys)
* @since 0.3
* @version 0.3
* @module
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -24,6 +24,10 @@ import java.util.List;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.Scanner;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -39,12 +43,10 @@ import static org.apache.sis.util.resour
* @author Martin Desruisseaux (Geomatys)
* @author Olivier Nouguier (Geomatys)
* @since 0.3
- * @version 0.5
+ * @version 0.7
* @module
- *
- * @goal compile-resources
- * @phase generate-resources
*/
+@Mojo(name = "compile-resources", defaultPhase = LifecyclePhase.GENERATE_RESOURCES)
public class ResourceCompilerMojo extends AbstractMojo implements FilenameFilter {
/**
* Pattern to filter properties files that were modified.
@@ -53,11 +55,8 @@ public class ResourceCompilerMojo extend
/**
* Project information (name, version, URL).
- *
- * @parameter property="project"
- * @required
- * @readonly
*/
+ @Parameter(property="project", required=true, readonly=true)
private MavenProject project;
/**
@@ -65,18 +64,14 @@ public class ResourceCompilerMojo extend
* When Maven is run from the command line, this object does nothing.
*
* @see <a href="http://wiki.eclipse.org/M2E_compatible_maven_plugins">M2E compatible maven plugins</a>
- *
- * @component
*/
+ @Component
private BuildContext buildContext;
/**
* The source directories containing the sources to be compiled.
- *
- * @parameter property="project.compileSourceRoots"
- * @required
- * @readonly
*/
+ @Parameter(property="project.compileSourceRoots", required=true, readonly=true)
private List<String> compileSourceRoots;
/**
@@ -88,10 +83,8 @@ public class ResourceCompilerMojo extend
* (for resources), such separation seems of limited use since the resources are copied verbatim in the JAR
* file, so preventing clash in the <code>generated-resources</code> directory would not prevent clash in
* the JAR file anyway.</p>
- *
- * @parameter default-value="${project.build.directory}/generated-resources"
- * @required
*/
+ @Parameter(defaultValue="${project.build.directory}/generated-resources", required=true)
private File outputDirectory;
/**
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -21,6 +21,7 @@ import java.io.Serializable;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import org.opengis.metadata.Identifier;
@@ -182,6 +183,7 @@ public class ISOMetadata extends Modifia
*/
@XmlID
@XmlAttribute // Defined in "gco" as unqualified attribute.
+ @XmlSchemaType(name = "ID")
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String getID() {
return isNullOrEmpty(identifiers) ? null : MetadataUtilities.getObjectID(this);
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -19,6 +19,7 @@ package org.apache.sis.metadata.iso.iden
import java.util.Collection;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
@@ -394,6 +395,7 @@ public class DefaultRepresentativeFracti
*/
@XmlID
@XmlAttribute // Defined in "gco" as unqualified attribute.
+ @XmlSchemaType(name = "ID")
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String getID() {
return isNullOrEmpty(identifiers) ? null : MetadataUtilities.getObjectID(this);
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -515,6 +515,7 @@ public class AbstractElement extends ISO
*/
@Override
@XmlElement(name = "dateTime")
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
public Collection<Date> getDates() {
if (Semaphores.query(Semaphores.NULL_COLLECTION)) {
return isNullOrEmpty(dates) ? null : dates;
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -19,6 +19,7 @@ package org.apache.sis.referencing.datum
import java.util.Date;
import java.util.Map;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
@@ -287,6 +288,7 @@ public class AbstractDatum extends Abstr
* @return The time after which this datum definition is valid, or {@code null} if none.
*/
@Override
+ @XmlSchemaType(name = "date")
@XmlElement(name = "realizationEpoch")
public Date getRealizationEpoch() {
return MetadataUtilities.toDate(realizationEpoch);
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -19,6 +19,7 @@ package org.apache.sis.referencing.datum
import java.util.Date;
import java.util.Map;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -215,6 +216,7 @@ public class DefaultTemporalDatum extend
*/
@Override
@XmlElement(name = "origin")
+ @XmlSchemaType(name = "dateTime")
@XmlJavaTypeAdapter(UniversalTimeAdapter.class)
public Date getOrigin() {
return MetadataUtilities.toDate(origin);
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,8 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -31,6 +33,7 @@ import javax.xml.bind.annotation.XmlElem
* @version 0.4
* @module
*/
+@XmlType(name = "Boolean_PropertyType")
public final class GO_Boolean extends PropertyType<GO_Boolean, Boolean> {
/**
* Empty constructor used only by JAXB.
@@ -77,6 +80,7 @@ public final class GO_Boolean extends Pr
* @return The value to be marshalled.
*/
@XmlElement(name = "Boolean")
+ @XmlSchemaType(name = "boolean")
public Boolean getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -18,6 +18,7 @@ package org.apache.sis.internal.jaxb.gco
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlSeeAlso;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.internal.jaxb.Context;
@@ -153,6 +154,7 @@ public class GO_CharacterString {
*
* @return The text, or {@code null}.
*/
+ @XmlSchemaType(name = "string") // Not needed, but declared as a matter of principle.
@XmlElement(name = "CharacterString")
public final String getCharacterString() {
return (type == 0 && !(text instanceof Anchor)) ? StringAdapter.toString(text) : null;
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,7 +17,9 @@
package org.apache.sis.internal.jaxb.gco;
import java.util.Date;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
@@ -37,12 +39,14 @@ import org.apache.sis.internal.jaxb.XmlU
* @version 0.4
* @module
*/
+@XmlType(name = "Date_PropertyType")
public final class GO_DateTime extends XmlAdapter<GO_DateTime, Date> {
/**
* The date and time value using the {@code code "DateTime"} name.
* Only one of {@code date} and {@link #dateTime} shall be non-null.
*/
@XmlElement(name = "DateTime")
+ @XmlSchemaType(name = "dateTime")
private XMLGregorianCalendar dateTime;
/**
@@ -50,6 +54,7 @@ public final class GO_DateTime extends X
* hour, minutes or seconds to format.
*/
@XmlElement(name = "Date")
+ @XmlSchemaType(name = "date")
private XMLGregorianCalendar date;
/**
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,8 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -40,6 +42,7 @@ import javax.xml.bind.annotation.XmlElem
* @see GO_Real
* @see GO_Decimal32
*/
+@XmlType(name = "Decimal_PropertyType")
public final class GO_Decimal extends PropertyType<GO_Decimal, Double> {
/**
* Empty constructor used only by JAXB.
@@ -85,6 +88,7 @@ public final class GO_Decimal extends Pr
* @return The value to be marshalled.
*/
@XmlElement(name = "Decimal")
+ @XmlSchemaType(name = "decimal")
public Double getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,7 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
/**
@@ -75,6 +76,7 @@ public final class GO_Decimal32 extends
* @return The value to be marshalled.
*/
@XmlElement(name = "Decimal")
+ @XmlSchemaType(name = "decimal")
public Float getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,7 @@
package org.apache.sis.internal.jaxb.gco;
import javax.measure.unit.SI;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.internal.jaxb.gml.Measure;
@@ -35,6 +36,7 @@ import org.apache.sis.internal.jaxb.gml.
* @version 0.3
* @module
*/
+@XmlType(name = "Distance_PropertyType")
public final class GO_Distance extends XmlAdapter<GO_Distance, Double> {
/**
* A proxy representation of the {@code <gco:Distance>} element.
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,8 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -33,6 +35,7 @@ import javax.xml.bind.annotation.XmlElem
*
* @see GO_Integer64
*/
+@XmlType(name = "Integer_PropertyType")
public final class GO_Integer extends PropertyType<GO_Integer, Integer> {
/**
* Empty constructor used only by JAXB.
@@ -78,6 +81,7 @@ public final class GO_Integer extends Pr
* @return The value to be marshalled.
*/
@XmlElement(name = "Integer")
+ @XmlSchemaType(name = "integer")
public Integer getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,7 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
/**
@@ -75,6 +76,7 @@ public final class GO_Integer64 extends
* @return The value to be marshalled.
*/
@XmlElement(name = "Integer")
+ @XmlSchemaType(name = "integer")
public Long getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,7 @@
package org.apache.sis.internal.jaxb.gco;
import javax.measure.unit.SI;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.internal.jaxb.gml.Measure;
@@ -35,6 +36,7 @@ import org.apache.sis.internal.jaxb.gml.
* @version 0.3
* @module
*/
+@XmlType(name = "Measure_PropertyType")
public final class GO_Measure extends XmlAdapter<GO_Measure, Double> {
/**
* A proxy representation of the {@code <gco:Measure>} element.
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -17,6 +17,8 @@
package org.apache.sis.internal.jaxb.gco;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -35,6 +37,7 @@ import javax.xml.bind.annotation.XmlElem
* @version 0.3
* @module
*/
+@XmlType(name = "Real_PropertyType")
public final class GO_Real extends PropertyType<GO_Real, Double> {
/**
* Empty constructor used only by JAXB.
@@ -80,6 +83,7 @@ public final class GO_Real extends Prope
* @return The value to be marshalled.
*/
@XmlElement(name = "Real")
+ @XmlSchemaType(name = "double")
public Double getElement() {
return metadata;
}
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -20,6 +20,7 @@ import java.util.UUID;
import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.XLink;
import org.apache.sis.xml.NilObject;
@@ -369,6 +370,7 @@ public abstract class PropertyType<Value
* @return the current value, or {@code null} if none.
* @category xlink
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "href", namespace = Namespaces.XLINK)
public final String getHRef() {
final XLink link = xlink(false);
@@ -392,6 +394,7 @@ public abstract class PropertyType<Value
* @return the current value, or {@code null} if none.
* @category xlink
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "role", namespace = Namespaces.XLINK)
public final String getRole() {
final XLink link = xlink(false);
@@ -415,6 +418,7 @@ public abstract class PropertyType<Value
* @return the current value, or {@code null} if none.
* @category xlink
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "arcrole", namespace = Namespaces.XLINK)
public final String getArcRole() {
final XLink link = xlink(false);
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -746,6 +746,11 @@ public final class Errors extends Indexe
public static final short NonUniformScale = 88;
/**
+ * No element for the “{0}” identifier, or the identifier is a forward reference.
+ */
+ public static final short NotABackwardReference_1 = 199;
+
+ /**
* Argument ‘{0}’ shall not be NaN (Not-a-Number).
*/
public static final short NotANumber_1 = 89;
@@ -916,6 +921,11 @@ public final class Errors extends Indexe
public static final short UnexpectedParameter_1 = 152;
/**
+ * Expected “{0}” to reference an instance of ‘{1}’, but found an instance of ‘{2}’.
+ */
+ public static final short UnexpectedTypeForReference_3 = 200;
+
+ /**
* Unexpected value “{1}” in “{0}” element.
*/
public static final short UnexpectedValueInElement_2 = 191;
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Fri Oct 9 20:22:18 2015
@@ -155,6 +155,7 @@ NonPerpendicularDirections_2 = Axis
NonScaleUnit_1 = \u201c{0}\u201d is not a scale unit.
NonTemporalUnit_1 = \u201c{0}\u201d is not a time unit.
NonUniformScale = Scale is not uniform.
+NotABackwardReference_1 = No element for the \u201c{0}\u201d identifier, or the identifier is a forward reference.
NotAnAffineTransform = Transform is not affine.
NotANumber_1 = Argument \u2018{0}\u2019 shall not be NaN (Not-a-Number).
NotAPrimitiveWrapper_1 = Class \u2018{0}\u2019 is not a primitive type wrapper.
@@ -194,6 +195,7 @@ UnexpectedEndOfFile_1 = Unex
UnexpectedEndOfString_1 = More characters were expected at the end of \u201c{0}\u201d.
UnexpectedFileFormat_2 = File \u201c{1}\u201d seems to be encoded in an other format than {0}.
UnexpectedParameter_1 = Parameter \u201c{0}\u201d was not expected.
+UnexpectedTypeForReference_3 = Expected \u201c{0}\u201d to reference an instance of \u2018{1}\u2019, but found an instance of \u2018{2}\u2019.
UnexpectedValueInElement_2 = Unexpected value \u201c{1}\u201d in \u201c{0}\u201d element.
UnitlessParameter_1 = Parameter \u201c{0}\u201d has no unit.
UnknownAuthority_1 = Authority \u201c{0}\u201d is unknown.
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Fri Oct 9 20:22:18 2015
@@ -152,6 +152,7 @@ NonPerpendicularDirections_2 = Les
NonScaleUnit_1 = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 d\u2019\u00e9chelles.
NonTemporalUnit_1 = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 de temps.
NonUniformScale = L\u2019\u00e9chelle n\u2019est pas uniforme.
+NotABackwardReference_1 = Il n\u2019y a pas d\u2019\u00e9l\u00e9ment pour l\u2019identifiant \u201c{0}\u201d, ou l\u2019identifiant est une r\u00e9f\u00e9rence vers l\u2019avant.
NotAnAffineTransform = La transformation n\u2019est pas affine.
NotANumber_1 = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre NaN (Not-a-Number).
NotAPrimitiveWrapper_1 = La classe \u2018{0}\u2019 n\u2019est pas un adaptateur d\u2019un type primitif.
@@ -190,6 +191,7 @@ UnexpectedEndOfFile_1 = Fin
UnexpectedEndOfString_1 = D\u2019autres caract\u00e8res \u00e9taient attendus \u00e0 la fin du texte \u00ab\u202f{0}\u202f\u00bb.
UnexpectedFileFormat_2 = Le fichier \u00ab\u202f{1}\u202f\u00bb semble \u00eatre encod\u00e9 dans un autre format que {0}.
UnexpectedParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb est inattendu.
+UnexpectedTypeForReference_3 = L\u2019identifiant \u201c{0}\u201d r\u00e9f\u00e9rence une instance de \u2018{2}\u2019 alors qu\u2019on attendait une instance de \u2018{1}\u2019.
UnexpectedValueInElement_2 = La valeur \u00ab\u202f{1}\u202f\u00bb dans l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb est inattendue.
UnitlessParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019a pas d\u2019unit\u00e9.
UnknownAuthority_1 = L\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -63,7 +63,10 @@ public interface IdentifierSpace<T> exte
* for {@code "gco:id"} in metadata documents. However the {@code "gco:"} prefix is omitted
* in XML documents (i.e. the {@code gco:id} attribute is <cite>unqualified</cite>).</p>
*
- * <p>The XML attribute name of the reference to such identified object is {@code "xlink:href"}.</p>
+ * <p>Elements with {@code gml:id} or {@code gco:id} attribute can be referenced from other XML elements
+ * using the {@code xlink:href} attribute. This is done automatically by Apache SIS implementations at
+ * marshalling and unmarshalling time. If many of {@code gml:id}, {@code gco:uuid} and {@code xlink:href}
+ * attributes are used, then {@code gml:id} has precedence.</p>
*
* @see javax.xml.bind.annotation.XmlID
*/
@@ -78,7 +81,9 @@ public interface IdentifierSpace<T> exte
* {@code "gco:"} prefix is omitted in XML documents (i.e. the {@code gco:uuid} attribute
* is <cite>unqualified</cite>).</p>
*
- * <p>The XML attribute name of the reference to such identified object is {@code "gco:uuidref"}.
+ * <p>Elements with {@code gco:uuid} attribute can be referenced from other XML elements using the
+ * {@code gco:uuidref} attribute. However this is not done automatically by Apache SIS. Users need
+ * to manage their set of UUIDs in their own {@link ReferenceResolver} subclass.</p>
*
* @see UUID
*/
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -129,9 +129,22 @@ public class ReferenceResolver {
ensureNonNull("xlink", link);
final URI href = link.getHRef();
if (href != null && href.toString().startsWith("#")) {
- final Object object = Context.getObjectForID(Context.current(), href.getFragment());
+ final String id = href.getFragment();
+ final Context c = (context instanceof Context) ? (Context) context : Context.current();
+ final Object object = Context.getObjectForID(c, id);
if (type.isInstance(object)) {
return type.cast(object);
+ } else {
+ final short key;
+ final Object args;
+ if (object == null) {
+ key = Errors.Keys.NotABackwardReference_1;
+ args = id;
+ } else {
+ key = Errors.Keys.UnexpectedTypeForReference_3;
+ args = new Object[] {id, type, object.getClass()};
+ }
+ Context.warningOccured(c, ReferenceResolver.class, "resolve", Errors.class, key, args);
}
}
return null;
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] Fri Oct 9 20:22:18 2015
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlEnum
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlSchemaType;
import org.opengis.util.InternationalString;
import org.apache.sis.util.Classes;
import org.apache.sis.util.logging.Logging;
@@ -422,6 +423,7 @@ public class XLink implements Serializab
*
* @category locator
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "href", namespace = Namespaces.XLINK)
public URI getHRef() {
return href;
@@ -449,6 +451,7 @@ public class XLink implements Serializab
*
* @category semantic
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "role", namespace = Namespaces.XLINK)
public URI getRole() {
return role;
@@ -476,6 +479,7 @@ public class XLink implements Serializab
*
* @category semantic
*/
+ @XmlSchemaType(name = "anyURI")
@XmlAttribute(name = "arcrole", namespace = Namespaces.XLINK)
public URI getArcRole() {
return arcrole;
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1707808&r1=1707807&r2=1707808&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Fri Oct 9 20:22:18 2015
@@ -24,6 +24,9 @@
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>3.2.2</maven>
+ </prerequisites>
<parent>
<groupId>org.apache</groupId>
@@ -357,14 +360,14 @@ Apache SIS is a free software, Java lang
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.9</version>
+ <version>1.10</version>
</dependency>
<!-- Optional dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -694,7 +697,7 @@ Apache SIS is a free software, Java lang
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.14.v20131031</version>
+ <version>8.1.16.v20140903</version> <!-- Versions 9.0.* require JDK 7 -->
</plugin>
</plugins>
</pluginManagement>