Author: desruisseaux
Date: Thu Jun 6 08:25:34 2013
New Revision: 1490193
URL: http://svn.apache.org/r1490193
Log:
Merged SIS-101 from the JDK7 branch.
Added:
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/index/
- copied from r1490192,
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/
sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/index/
- copied from r1490192,
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/
sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/index/
- copied from r1490192,
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/
Removed:
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/storage/
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/storage/
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/storage/
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/CHANGES
sis/branches/JDK6/application/sis-webapp/pom.xml
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
sis/branches/JDK6/pom.xml
sis/branches/JDK6/storage/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1490058-1490192
Modified: sis/branches/JDK6/CHANGES
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/CHANGES?rev=1490193&r1=1490192&r2=1490193&view=diff
==============================================================================
--- sis/branches/JDK6/CHANGES (original)
+++ sis/branches/JDK6/CHANGES Thu Jun 6 08:25:34 2013
@@ -1,7 +1,10 @@
Apache SIS Change Log
======================
-Release 0.3-incubating - Current Development
+Release 0.3 - Current Development
+
+* 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)
Modified: sis/branches/JDK6/application/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-webapp/pom.xml?rev=1490193&r1=1490192&r2=1490193&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK6/application/sis-webapp/pom.xml Thu Jun 6 08:25:34 2013
@@ -53,8 +53,8 @@
module only. -->
</dependency>
<dependency>
- <groupId>org.apache.sis</groupId>
- <artifactId>sis-referencing</artifactId>
+ <groupId>org.apache.sis.storage</groupId>
+ <artifactId>sis-storage</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified:
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java?rev=1490193&r1=1490192&r2=1490193&view=diff
==============================================================================
---
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] (original)
+++
sis/branches/JDK6/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] Thu Jun 6 08:25:34 2013
@@ -55,11 +55,11 @@ 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.storage.QuadTree;
-import org.apache.sis.storage.QuadTreeData;
-import org.apache.sis.storage.QuadTreeReader;
-import org.apache.sis.storage.QuadTreeWriter;
+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;
+import org.apache.sis.index.tree.QuadTreeWriter;
//ROME imports
import com.sun.syndication.feed.WireFeed;
@@ -70,11 +70,11 @@ import com.sun.syndication.io.WireFeedIn
import com.sun.syndication.io.XmlReader;
/**
- *
+ *
* A location web service that loads data from GeoRSS format (configured via a
* provided config.xml file), and then loads up a {@link QuadTree} with this
* information, making it queryable for callers.
- *
+ *
*/
public class LocationServlet extends HttpServlet {
@@ -88,7 +88,7 @@ public class LocationServlet extends Htt
/**
* Read GeoRSS data (location information provide sis-location-config.xml )
* and build quad-tree.
- *
+ *
* @param config
* Servlet configuration file
* @exception ServletException
@@ -233,7 +233,7 @@ public class LocationServlet extends Htt
/**
* Provide GET requests for Bounding-box and Point-radius search queries.
* Return search results to client in xml format.
- *
+ *
* @param request
* Http Servlet Request
* @param response
@@ -335,7 +335,7 @@ public class LocationServlet extends Htt
/**
* Provide Post requests for build GeoRSS data html file.
- *
+ *
* @param request
* Http Servlet Request
* @param response
@@ -386,7 +386,7 @@ public class LocationServlet extends Htt
/**
* Builds the XML file to return to client.
- *
+ *
* @param filterList
* list of QuadTreeData that are within the search region
* @param regions
@@ -474,7 +474,7 @@ public class LocationServlet extends Htt
/**
* Replace all non-alphanumeric characters with empty strings.
- *
+ *
* @param id
* @return String without any non-alphanumeric characters
*/
Modified: sis/branches/JDK6/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1490193&r1=1490192&r2=1490193&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Thu Jun 6 08:25:34 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>
Modified: sis/branches/JDK6/storage/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/storage/pom.xml?rev=1490193&r1=1490192&r2=1490193&view=diff
==============================================================================
--- sis/branches/JDK6/storage/pom.xml (original)
+++ sis/branches/JDK6/storage/pom.xml Thu Jun 6 08:25:34 2013
@@ -84,6 +84,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.sis</groupId>
+ <artifactId>sis-referencing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi-pending</artifactId>
</dependency>
