Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] Fri Jun 14 17:28:50 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/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java [UTF-8] Fri Jun 14 17:28:50 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/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Fri Jun 14 17:28:50 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/trunk/ide-project/NetBeans/nbproject/project.properties URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original) +++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Fri Jun 14 17:28:50 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/trunk/ide-project/eclipse/classpath URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/eclipse/classpath?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/ide-project/eclipse/classpath (original) +++ sis/trunk/ide-project/eclipse/classpath Fri Jun 14 17:28:50 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/trunk/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/pom.xml (original) +++ sis/trunk/pom.xml Fri Jun 14 17:28:50 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/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1493175&r1=1493174&r2=1493175&view=diff ============================================================================== --- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] (original) +++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] Fri Jun 14 17:28:50 2013 @@ -65,7 +65,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.
