Author: rgardler
Date: Wed Jan 18 16:30:05 2006
New Revision: 370329
URL: http://svn.apache.org/viewcvs?rev=370329&view=rev
Log:
add lat/long coords (ready for Google maps integration)
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml
(with props)
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/catalog.xcat
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/locations-to-document.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/site.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/status.xml
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/catalog.xcat
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/catalog.xcat?rev=370329&r1=370328&r2=370329&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/catalog.xcat
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/catalog.xcat
Wed Jan 18 16:30:05 2006
@@ -28,4 +28,7 @@
<public publicId="-//Apache Forrest//DTD Locations V1.1//EN"
uri="locations-v11.dtd"/>
+
+<public publicId="-//Apache Forrest//DTD Locations V1.2//EN"
+ uri="locations-v12.dtd"/>
</catalog>
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd?rev=370329&view=auto
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd
Wed Jan 18 16:30:05 2006
@@ -0,0 +1,64 @@
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- ===================================================================
+
+ Apache Forrest - Locations DTD (Version 1.1)
+
+PURPOSE: Simple list of locations.
+
+TYPICAL INVOCATION:
+
+ <!DOCTYPE locations PUBLIC
+ "-//Apache Forrest//DTD Locations Vx.y//EN"
+ "locations-v10.dtd">
+
+ where
+
+ x := major version
+ y := minor version
+
+==================================================================== -->
+
+<!ENTITY % common-charents PUBLIC
+ "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+ "common-charents-v10.mod">
+%common-charents;
+
+<!ELEMENT locations (introduction?, location+)>
+<!ATTLIST locations
+ title CDATA #IMPLIED
+>
+<!ELEMENT introduction (#PCDATA)>
+<!ELEMENT location (id, title, place, url?, notes?, geoPoint?)>
+<!ELEMENT id (#PCDATA)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT place (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+<!ELEMENT notes (note+)>
+<!ELEMENT note (#PCDATA | a)*>
+<!ELEMENT geoPoint (latitude, longitude)>
+<!ELEMENT longitude (#PCDATA)>
+<!ELEMENT latitude (#PCDATA)>
+<!ELEMENT a (#PCDATA)>
+<!ATTLIST a
+ href CDATA #REQUIRED
+ title CDATA #IMPLIED
+>
+
+<!-- =============================================================== -->
+<!-- End of DTD -->
+<!-- =============================================================== -->
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/schema/locations-v12.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/locations-to-document.xsl
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/locations-to-document.xsl?rev=370329&r1=370328&r2=370329&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/locations-to-document.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/locations-to-document.xsl
Wed Jan 18 16:30:05 2006
@@ -90,6 +90,10 @@
<xsl:template match="note">
<p><xsl:apply-templates/></p>
</xsl:template>
+
+ <xsl:template match="geoPoint">
+ <p>Latitude: <xsl:apply-templates select="latitude"/> Longitude:
<xsl:apply-templates select="longitude"/></p>
+ </xsl:template>
<xsl:template match="id | title | place | url"/>
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml?rev=370329&view=auto
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml
Wed Jan 18 16:30:05 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE locations PUBLIC "-//Apache Forrest//DTD Locations V1.2//EN"
"http://forrest.apache.org/dtd/locations-v12.dtd">
+
+<locations title="Apache Forrest Developer Locations">
+
+<introduction>
+ The locations of some of the Apache Forrest developers.
+</introduction>
+
+<location>
+ <id>RDG</id>
+ <title>Ross Gardler</title>
+ <place>
+ Longridge, UK
+ </place>
+ <url>http://www.wkwyw.net</url>
+ <geoPoint>
+ <latitude>53.828003</latitude>
+ <longitude>-2.602202</longitude>
+ </geoPoint>
+</location>
+</locations>
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/developer-locations.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/site.xml?rev=370329&r1=370328&r2=370329&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/site.xml
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/src/documentation/content/xdocs/site.xml
Wed Jan 18 16:30:05 2006
@@ -37,8 +37,12 @@
<forrestPlugins label="Plugins Index" href="site:forrest/plugins"
description="Index of Forrest Plugins"/>
<changes label="Changes" href="changes.html" description="History of
Changes" />
<todo label="Todo" href="todo.html" description="Todo List" />
- <locations label="Locations" href="locations.html" description="List of
locations" />
</about>
+
+ <samples label="Samples">
+ <locations label="Locations" href="locations.html" description="List of
locations" />
+ <develop-locations label="Forrest Developers"
href="developer-locations.html" description="Locations of some Apache Forrest
Developers"/>
+ </samples>
<!--
The href must be wholesite.html/pdf You can change the labels and node names
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/status.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/status.xml?rev=370329&r1=370328&r2=370329&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/status.xml
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/status.xml
Wed Jan 18 16:30:05 2006
@@ -36,6 +36,10 @@
<changes>
<!-- Add new releases here -->
<release version="0.2-dev" date="not-released">
+ <action dev="RDG" type="add" context="code" importance="high">
+ Added geoPoint element to DTD to allow the recording of Latitude and
Longitude
+ co-ords for entries.
+ </action>
<action dev="DC" type="update" context="core" importance="high"
due-to="Philippe Perez">
Use locationmap for resource resolution. Exposes internal stylesheets
as {lm:listLocations.transform.*.*}