sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1391365 - in /sis/trunk: ./ sis-build-helper/src/main/java/org/apache/sis/resources/ sis-build-helper/src/main/java/org/apache/sis/util/ sis-build-helper/src/main/java/org/apache/sis/util/resources/ sis-build-helper/src/site/apt/ sis-utili...
Date Fri, 28 Sep 2012 08:45:35 GMT
Author: desruisseaux
Date: Fri Sep 28 08:45:34 2012
New Revision: 1391365

URL: http://svn.apache.org/viewvc?rev=1391365&view=rev
Log:
Moved the 'resources' package as a sub-package of 'util'. No change in the code.
The intend is to make more visible in which module belong the package, and
hopefully to be slightly more intuitive since this package relate to classes
defined in java.util.

Added:
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/
      - copied from r1391297, sis/trunk/sis-build-helper/src/main/java/org/apache/sis/resources/
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/
      - copied from r1391297, sis/trunk/sis-utility/src/main/java/org/apache/sis/resources/
    sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/
      - copied from r1391297, sis/trunk/sis-utility/src/test/java/org/apache/sis/resources/
Removed:
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/resources/
    sis/trunk/sis-utility/src/main/java/org/apache/sis/resources/
    sis/trunk/sis-utility/src/test/java/org/apache/sis/resources/
Modified:
    sis/trunk/pom.xml
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
    sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
    sis/trunk/sis-build-helper/src/site/apt/index.apt
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java
    sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
    sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java

Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1391365&r1=1391364&r2=1391365&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Fri Sep 28 08:45:34 2012
@@ -455,11 +455,11 @@ Apache SIS is a toolkit for describing l
             </group>
             <group>
               <title>Metadata</title>
-              <packages>org.apache.sis.metadata*:org.apache.sis.naming*</packages>
+              <packages>org.apache.sis.metadata*</packages>
             </group>
             <group>
               <title>Utilities</title>
-              <packages>org.apache.sis.io*:org.apache.sis.util*:org.apache.sis.resources*</packages>
+              <packages>org.apache.sis.io*:org.apache.sis.util*</packages>
             </group>
           </groups>
 

Modified: sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
(original)
+++ sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
Fri Sep 28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.io.*;
 import java.util.*;
@@ -94,7 +94,7 @@ class IndexedResourceCompiler implements
 
     /**
      * The resource bundle base class being processed.
-     * Example: {@code org/apache/sis/resources/Vocabulary.java}.
+     * Example: {@code org/apache/sis/util/resources/Vocabulary.java}.
      */
     private File bundleClass;
 
@@ -126,7 +126,7 @@ class IndexedResourceCompiler implements
      * @param sourceDirectory The source directory.
      * @param buildDirectory  The target directory where to write UTF files.
      * @param resourcesToProcess The resource bundle base classes
-     *        (e.g. {@code org/apache/sis/resources/Vocabulary.java}).
+     *        (e.g. {@code org/apache/sis/util/resources/Vocabulary.java}).
      */
     public IndexedResourceCompiler(final File sourceDirectory, final File buildDirectory,
             final File[] resourcesToProcess)

Modified: sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
(original)
+++ sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
Fri Sep 28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import org.apache.maven.plugin.MojoExecutionException;
 

Modified: sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
(original)
+++ sis/trunk/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
Fri Sep 28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -64,7 +64,7 @@ public class ResourceCompilerMojo extend
         for (final String sourceDirectory : compileSourceRoots) {
             File directory = new File(sourceDirectory);
             if (directory.getName().equals("java")) {
-                final File[] resourcesToProcess = new File(sourceDirectory, "org/apache/sis/resources").listFiles(this);
+                final File[] resourcesToProcess = new File(sourceDirectory, "org/apache/sis/util/resources").listFiles(this);
                 if (resourcesToProcess != null && resourcesToProcess.length != 0)
{
                     errors += new Compiler(directory, target, resourcesToProcess).run();
                 }

Modified: sis/trunk/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/trunk/sis-build-helper/src/site/apt/index.apt?rev=1391365&r1=1391364&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-build-helper/src/site/apt/index.apt (original)
+++ sis/trunk/sis-build-helper/src/site/apt/index.apt Fri Sep 28 08:45:34 2012
@@ -50,7 +50,7 @@ Building Apache SIS
 
   The resource compiler is executed at Maven build time if the <<<pom.xml>>>
file
   contains the following declaration. Note that current implementation looks only for resources
-  in the <<<org.apache.sis.resources>>> package; all other packages are
ignored.
+  in the <<<org.apache.sis.util.resources>>> package; all other packages
are ignored.
 
 +-----------------------------------------------------
 <build>

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java?rev=1391365&r1=1391364&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java Fri Sep 28
08:45:34 2012
@@ -19,7 +19,7 @@ package org.apache.sis.util;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.geometry.MismatchedDimensionException;
 
-import org.apache.sis.resources.Errors;
+import org.apache.sis.util.resources.Errors;
 
 
 /**

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Numbers.java?rev=1391365&r1=1391364&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Numbers.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Numbers.java Fri Sep 28 08:45:34
2012
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.apache.sis.resources.Errors;
+import org.apache.sis.util.resources.Errors;
 
 
 /**

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java?rev=1391365&r1=1391364&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java Fri Sep 28
08:45:34 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.util;
 
-import org.apache.sis.resources.Errors;
+import org.apache.sis.util.resources.Errors;
 
 import static java.lang.Character.*;
 

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java Fri Sep
28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.util.Locale;
 import java.util.MissingResourceException;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
Fri Sep 28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java Fri Sep
28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.util.List;
 import java.util.Locale;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java Fri
Sep 28 08:45:34 2012
@@ -47,4 +47,4 @@
  * @see java.util.ResourceBundle
  * @see java.text.MessageFormat
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;

Modified: sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java?rev=1391365&r1=1391297&r2=1391365&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
(original)
+++ sis/trunk/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
Fri Sep 28 08:45:34 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.resources;
+package org.apache.sis.util.resources;
 
 import java.util.Locale;
 



Mime
View raw message