Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -29,13 +29,13 @@ import java.util.TreeMap; import java.util.SortedMap; import java.util.Comparator; import java.util.logging.*; -import net.jcip.annotations.ThreadSafe; import org.apache.sis.internal.system.OS; import org.apache.sis.internal.util.X364; import org.apache.sis.io.IO; import org.apache.sis.io.LineAppender; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Configuration; +import org.apache.sis.util.ThreadSafe; import org.apache.sis.util.Debug; // Related to JDK7
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -21,8 +21,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.LogRecord; import java.util.NoSuchElementException; -import net.jcip.annotations.ThreadSafe; import org.apache.sis.util.Localized; +import org.apache.sis.util.ThreadSafe; import org.apache.sis.util.Exceptions; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.resources.Errors; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -28,13 +28,11 @@ import java.util.NoSuchElementException; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.LogRecord; -import net.jcip.annotations.ThreadSafe; - import org.opengis.util.InternationalString; - import org.apache.sis.util.Debug; import org.apache.sis.util.Classes; import org.apache.sis.util.Localized; +import org.apache.sis.util.ThreadSafe; import org.apache.sis.util.Exceptions; import org.apache.sis.util.CharSequences; import org.apache.sis.util.logging.Logging; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -23,7 +23,7 @@ import java.io.InvalidObjectException; import java.io.IOException; import java.util.Locale; import java.util.MissingResourceException; -import net.jcip.annotations.Immutable; +import org.apache.sis.util.Immutable; import org.apache.sis.util.Utilities; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.iso.AbstractInternationalString; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -24,10 +24,10 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import net.jcip.annotations.ThreadSafe; +import org.apache.sis.util.ThreadSafe; import org.apache.sis.util.logging.Logging; -import org.apache.sis.internal.util.DelayedExecutor; -import org.apache.sis.internal.util.DelayedRunnable; +import org.apache.sis.internal.system.DelayedExecutor; +import org.apache.sis.internal.system.DelayedRunnable; import org.apache.sis.internal.jaxb.AdapterReplacement; import org.apache.sis.internal.jaxb.TypeRegistration; import org.apache.sis.util.ArgumentChecks; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -21,7 +21,7 @@ import java.net.URISyntaxException; import java.io.Serializable; import java.lang.reflect.Proxy; import java.lang.reflect.InvocationHandler; -import net.jcip.annotations.Immutable; +import org.apache.sis.util.Immutable; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.CharSequences; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -17,7 +17,7 @@ package org.apache.sis.xml; import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper; -import net.jcip.annotations.Immutable; +import org.apache.sis.util.Immutable; /** @@ -46,6 +46,7 @@ final class OGCNamespacePrefixMapper ext /** * Creates a new prefix mapper. + * This constructor is invoked by reflection and needs to be public for that reason. * * @param defaultNamespace The namespace which doesn't need prefix, or {@code null} if none. */ Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -17,7 +17,7 @@ package org.apache.sis.xml; import com.sun.xml.bind.marshaller.NamespacePrefixMapper; -import net.jcip.annotations.Immutable; +import org.apache.sis.util.Immutable; /** @@ -41,6 +41,7 @@ final class OGCNamespacePrefixMapper_End /** * Creates a new prefix mapper. + * This constructor is invoked by reflection and needs to be public for that reason. * * @param defaultNamespace The namespace which doesn't need prefix, or {@code null} if none. */ 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=1493167&r1=1493166&r2=1493167&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 Jun 14 17:21:37 2013 @@ -23,10 +23,9 @@ 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 net.jcip.annotations.ThreadSafe; - import org.opengis.util.InternationalString; import org.apache.sis.util.Classes; +import org.apache.sis.util.ThreadSafe; import org.apache.sis.util.logging.Logging; import org.apache.sis.util.resources.Errors; Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -26,7 +26,7 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.JAXBException; import org.apache.sis.util.Static; -import org.apache.sis.internal.util.SystemListener; +import org.apache.sis.internal.system.SystemListener; import org.apache.sis.internal.jaxb.TypeRegistration; Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java?rev=1493167&r1=1493150&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -45,7 +45,7 @@ public final strictfp class ReferenceQue */ @Test(expected=InterruptedException.class) public void verifyInterruptAssumption() throws InterruptedException { - final ReferenceQueue<Object> queue = new ReferenceQueue<>(); + final ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); Thread.currentThread().interrupt(); assertNull(queue.remove(1000)); } Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -21,7 +21,6 @@ import java.util.List; import java.util.HashSet; import java.util.Arrays; import java.util.Comparator; -import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.junit.runner.Description; @@ -51,7 +50,7 @@ import static org.apache.sis.util.collec * <li>Support of the {@link DependsOn} and {@link DependsOnMethod} annotations.</li> * </ul> * - * This runner is not designed for parallel execution of tests. + * This runner is <strong>not</strong> designed for parallel execution of tests. * * @author Stephen Connolly * @author Martin Desruisseaux (Geomatys) @@ -59,7 +58,6 @@ import static org.apache.sis.util.collec * @version 0.3 * @module */ -@NotThreadSafe public final class TestRunner extends BlockJUnit4ClassRunner { /** * The test methods to be executed, sorted according their dependencies. Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -58,7 +58,7 @@ import org.junit.BeforeClass; org.apache.sis.internal.jdk8.JDK8Test.class, // Collections. - org.apache.sis.internal.util.ReferenceQueueConsumerTest.class, + org.apache.sis.internal.system.ReferenceQueueConsumerTest.class, org.apache.sis.util.collection.WeakHashSetTest.class, org.apache.sis.util.collection.WeakValueHashMapTest.class, org.apache.sis.util.collection.CacheTest.class, Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original) +++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Fri Jun 14 17:21:37 2013 @@ -54,7 +54,6 @@ georss.version = 0.9.8 rome.version = 0.9 jdom.version = 1.0 jee.version = 6.0 -jcip.version = 1.0 osgi.version = 5.0.0 netcdf.version = 4.3.16 joda-time.version = 2.0 @@ -77,7 +76,6 @@ javac.classpath=\ ${maven.repository}/rome/rome/${rome.version}/rome-${rome.version}.jar:\ ${maven.repository}/jdom/jdom/${jdom.version}/jdom-${jdom.version}.jar:\ ${maven.repository}/javax/javaee-api/${jee.version}/javaee-api-${jee.version}.jar:\ - ${maven.repository}/net/jcip/jcip-annotations/${jcip.version}/jcip-annotations-${jcip.version}.jar:\ ${maven.repository}/edu/ucar/netcdf/${netcdf.version}/netcdf-${netcdf.version}.jar:\ ${maven.repository}/org/osgi/org.osgi.core/${osgi.version}/org.osgi.core-${osgi.version}.jar javac.processorpath=\ Modified: sis/branches/JDK6/ide-project/eclipse/classpath URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/eclipse/classpath?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/ide-project/eclipse/classpath (original) +++ sis/branches/JDK6/ide-project/eclipse/classpath Fri Jun 14 17:21:37 2013 @@ -21,7 +21,6 @@ <classpathentry kind="var" path="M2_REPO/org/opengis/geoapi/3.0.0/geoapi-3.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/opengis/geoapi-conformance/3.0.0/geoapi-conformance-3.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/javax/measure/jsr-275/0.9.3/jsr-275-0.9.3.jar"/> - <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/5.0.0/org.osgi.core-5.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/3.0.4/maven-core-3.0.4.jar"/> Modified: sis/branches/JDK6/pom.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/pom.xml (original) +++ sis/branches/JDK6/pom.xml Fri Jun 14 17:21:37 2013 @@ -330,11 +330,6 @@ Apache SIS is a free software, Java lang <version>6.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>1.0</version> - </dependency> <!-- Optional dependencies --> <dependency> Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1493167&r1=1493166&r2=1493167&view=diff ============================================================================== --- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] (original) +++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] Fri Jun 14 17:21:37 2013 @@ -64,7 +64,7 @@ import org.apache.sis.internal.netcdf.Ax import org.apache.sis.internal.netcdf.Decoder; import org.apache.sis.internal.netcdf.Variable; import org.apache.sis.internal.netcdf.GridGeometry; -import org.apache.sis.internal.util.DefaultFactories; +import org.apache.sis.internal.system.DefaultFactories; import org.apache.sis.internal.metadata.MetadataUtilities; // The following dependency is used only for static final String constants.
