Author: desruisseaux
Date: Thu Jun 6 08:23:05 2013
New Revision: 1490192
URL: http://svn.apache.org/r1490192
Log:
Completed the move of QuadTree classes by moving GeoRSSData too (SIS-101).
Added:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
- copied, changed from r1490188,
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
Removed:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/
Modified:
sis/branches/JDK7/CHANGES
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
sis/branches/JDK7/pom.xml
Modified: sis/branches/JDK7/CHANGES
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/CHANGES?rev=1490192&r1=1490191&r2=1490192&view=diff
==============================================================================
--- sis/branches/JDK7/CHANGES (original)
+++ sis/branches/JDK7/CHANGES Thu Jun 6 08:23:05 2013
@@ -3,8 +3,8 @@ Apache SIS Change Log
Release 0.3 - Current Development
-* SIS-101 Moved QuadTree and related classes to its own package,
- namely org.apache.sis.index.tree.
+* SIS-101 Moved QuadTree, GeoRSSData and related classes to their own package,
+ namely "org.apache.sis.index.tree".
* SIS-31 Website needs a facelift (aestrada, Ross Laidlaw,
Suresh Marru, mattmann)
Copied:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
(from r1490188,
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java?p2=sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java&p1=sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java&r1=1490188&r2=1490192&rev=1490192&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
[UTF-8] Thu Jun 6 08:23:05 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
//JDK imports
import java.io.BufferedReader;
@@ -29,7 +29,6 @@ import java.util.HashMap;
//SIS imports
import org.apache.sis.core.LatLon;
-import org.apache.sis.index.tree.QuadTreeData;
//ROME imports
import com.sun.syndication.feed.module.georss.GeoRSSModule;
Modified:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java?rev=1490192&r1=1490191&r2=1490192&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
[UTF-8] Thu Jun 6 08:23:05 2013
@@ -25,7 +25,6 @@ import java.io.IOException;
//SIS imports
import org.apache.sis.core.LatLon;
-import org.apache.sis.storage.GeoRSSData;
/**
* Class to reload the quad tree index from file.
Modified:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java?rev=1490192&r1=1490191&r2=1490192&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] Thu Jun 6 08:23:05 2013
@@ -55,7 +55,7 @@ import org.xml.sax.SAXException;
import org.apache.sis.core.LatLon;
import org.apache.sis.core.LatLonRect;
import org.apache.sis.distance.DistanceUtils;
-import org.apache.sis.storage.GeoRSSData;
+import org.apache.sis.index.tree.GeoRSSData;
import org.apache.sis.index.tree.QuadTree;
import org.apache.sis.index.tree.QuadTreeData;
import org.apache.sis.index.tree.QuadTreeReader;
Modified: sis/branches/JDK7/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1490192&r1=1490191&r2=1490192&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Thu Jun 6 08:23:05 2013
@@ -601,7 +601,7 @@ Apache SIS is a free software, Java lang
</group>
<group>
<title>Data storage</title>
- <packages>org.apache.sis.storage*</packages>
+
<packages>org.apache.sis.storage*:org.apache.sis.index*</packages>
</group>
<group>
<title>Geometry</title>
