Author: rgardler
Date: Sun Dec 3 14:39:19 2006
New Revision: 481953
URL: http://svn.apache.org/viewvc?view=rev&rev=481953
Log:
Change the name of the pattern attribute to regexp to pave the way for
different pattern expression languages (see FOR-947)
Modified:
forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/locationMap/Location.java
forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html
forrest/trunk/whiteboard/forrest2/core/src/docs/examples/affiliateProductCatalogue.html
forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml
Modified: forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml Sun Dec 3
14:39:19 2006
@@ -16,11 +16,11 @@
limitations under the License.
-->
<locationmap>
- <location pattern="http://localhost:8888/xhtml/testPage.html";>
+ <location regexp="http://localhost:8888/xhtml/testPage.html";>
<source href="classpath:/xdocs/samples/xhtml2/sample_complete.html"/>
</location>
- <location pattern="http://localhost:8888/test/helloWorld.html";>
+ <location regexp="http://localhost:8888/test/helloWorld.html";>
<source href="classpath:/xdocs/samples/xml/helloWorld.xml"/>
</location>
</locationmap>
Modified:
forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/locationMap/Location.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/locationMap/Location.java?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
---
forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/locationMap/Location.java
(original)
+++
forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/locationMap/Location.java
Sun Dec 3 14:39:19 2006
@@ -70,7 +70,7 @@
boolean isRequired = false;
final NamedNodeMap atts = element.getAttributes();
- pattern = atts.getNamedItem("pattern").getNodeValue();
+ pattern = atts.getNamedItem("regexp").getNodeValue();
final NodeList children = element.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
final Node child = children.item(i);
Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html
(original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html Sun Dec
3 14:39:19 2006
@@ -197,7 +197,7 @@
defined as: </p>
<code><![CDATA[
- <location pattern="http://localhost:8888/test/product.html";>
+ <location regexp="http://localhost:8888/test/product.html";>
<source href="product:/1"/>
</location>
]]></code>
Modified:
forrest/trunk/whiteboard/forrest2/core/src/docs/examples/affiliateProductCatalogue.html
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/examples/affiliateProductCatalogue.html?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
---
forrest/trunk/whiteboard/forrest2/core/src/docs/examples/affiliateProductCatalogue.html
(original)
+++
forrest/trunk/whiteboard/forrest2/core/src/docs/examples/affiliateProductCatalogue.html
Sun Dec 3 14:39:19 2006
@@ -74,7 +74,7 @@
Lets add a locationmap entry to read our example feed:</p>
<p class="code"><![CDATA[
- <location pattern="tradeDoubler.*">
+ <location regexp="tradeDoubler.*">
<source href="tradeDoubler:classpath:/xdocs/exampleFeed.xml"/>
</location>
]]></p>
@@ -85,7 +85,7 @@
example:</p>
<p class="code"><![CDATA[
- <location pattern="tradeDoubler.*">
+ <location regexp="tradeDoubler.*">
<source href="tradeDoubler:http://foo.org/bar.xml"/>
</location>
]]></p>
Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html Sun Dec 3
14:39:19 2006
@@ -141,7 +141,7 @@
<div class="code"><[![CDATA
<?xml version="1.0"?>
<locationmap>
-<location pattern="helloWorld.xhtml2">
+<location regexp="helloWorld.xhtml2">
<source href="classpath:/xdocs/helloWorld.xhtml2" />
</location>
</locationmap>
@@ -219,7 +219,7 @@
your locationmap:</p>
<div class="code"><![CDATA[
-<location pattern="helloWorld.html">
+<location regexp="helloWorld.html">
<source href="classpath:/xdocs/helloWorld.xhtml2" />
</location>
]]></div>
@@ -228,7 +228,7 @@
helloWorld.xhtml2 source file. Surely there is a way to express these two
matches in a more concise way.</p>
-<div class="todo">Explain that we could use pattern="helloWorld.*" for both
cases
+<div class="todo">Explain that we could use regexp="helloWorld.*" for both
cases
since the source file is the same . The pattern is a regular expression.</div>
<p>That's it, there is no need to tell Forrest that it must process a request
for
Modified:
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
---
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml
(original)
+++
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml
Sun Dec 3 14:39:19 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
<locationmap>
- <location pattern="tradeDoubler.*">
+ <location regexp="tradeDoubler.*">
<source href="tradeDoubler:classpath:/xdocs/exampleFeed.xml"/>
</location>
</locationmap>
Modified:
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
---
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
(original)
+++
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
Sun Dec 3 14:39:19 2006
@@ -16,11 +16,11 @@
limitations under the License.
-->
<locationmap>
- <location pattern="(.*).xhtml2">
+ <location regexp="(.*).xhtml2">
<source href="classpath:/xdocs/$(1).xhtml2"/>
</location>
- <location pattern="(.*)/(.*).html">
+ <location regexp="(.*)/(.*).html">
<source href="classpath:/xdocs/$(2).xhtml2"/>
</location>
</locationmap>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml?view=diff&rev=481953&r1=481952&r2=481953
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml Sun Dec 3
14:39:19 2006
@@ -16,24 +16,24 @@
limitations under the License.
-->
<locationmap>
- <location pattern="xhtml/testPage.*">
+ <location regexp="xhtml/testPage.*">
<source href="classpath:/xdocs/samples/xhtml2/sample_simple.html"/>
</location>
- <location pattern="xhtml/helloWorld.html">
+ <location regexp="xhtml/helloWorld.html">
<source href="hello:classpath:/xdocs/samples/xml/helloWorld.xml"/>
</location>
- <location pattern="(.*)/variable/(.*)\..*">
+ <location regexp="(.*)/variable/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
- <location pattern="(.*)/optional/(.*)\..*">
+ <location regexp="(.*)/optional/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html"/>
<source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
- <location pattern="(.*)/required/(.*)\..*">
+ <location regexp="(.*)/required/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html"
required="true"/>
<source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
