Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[663] trunk/treebase-web
|
From: <yo...@us...> - 2010-03-31 18:46:36
|
Revision: 663
http://treebase.svn.sourceforge.net/treebase/?rev=663&view=rev
Author: youjun
Date: 2010-03-31 18:46:29 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
bring in urlrewrite tool, re-direct "view tree" to phylowidget.org
Modified Paths:
--------------
trunk/treebase-web/pom.xml
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
trunk/treebase-web/src/main/webapp/WEB-INF/urlrewrite.xml
Modified: trunk/treebase-web/pom.xml
===================================================================
--- trunk/treebase-web/pom.xml 2010-03-31 14:49:01 UTC (rev 662)
+++ trunk/treebase-web/pom.xml 2010-03-31 18:46:29 UTC (rev 663)
@@ -77,6 +77,10 @@
<name>NeXML Remote Repository</name>
<url>http://nexml-dev.nescent.org/.m2/repository/</url>
</repository>
+ <repository>
+ <id>org.tuckey.urlrewritefilter</id>
+ <url>http://repository.jboss.org/maven2/org/tuckey/urlrewritefilter/</url>
+ </repository>
</repositories>
@@ -316,6 +320,11 @@
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.tuckey</groupId>
+ <artifactId>urlrewritefilter</artifactId>
+ <version>3.0.4</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp 2010-03-31 14:49:01 UTC (rev 662)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp 2010-03-31 18:46:29 UTC (rev 663)
@@ -19,11 +19,11 @@
export="false">
<display:column sortable="false" title="ID">
- <c:url var="treeURL" value="tree.html">
- <c:param name="id" value="${study.id}" />
- <c:param name="treeid" value="${tree.id}" />
- </c:url>
- <a href="javascript:popupWithSizes('${treeURL}',1000,900,'1')">Tr${tree.id}</a>
+ <c:url var="url" value="/tree_for_phylowidget/">
+ <!--c:param name="treeid" value="${tree.id}" /-->
+ <!--c:param name="id" value="${tree.study.id}" /-->
+ </c:url>
+ <a href="http://www.phylowidget.org/full/?tree='http://<%=request.getServerName()%>:<%=request.getServerPort()%>${url}TB2:Tr${tree.id}'" target="myplwidget">Tr${tree.id}</a>
</display:column>
<display:column
@@ -119,11 +119,11 @@
sortable="false"
class="iconColumn"
headerClass="iconColumn">
- <c:url var="treeURL" value="tree.html">
- <c:param name="id" value="${study.id}" />
- <c:param name="treeid" value="${tree.id}" />
- </c:url>
- <a href="javascript:popupWithSizes('${treeURL}',1000,900,'1')">
+ <c:url var="url" value="/tree_for_phylowidget/">
+ <!--c:param name="treeid" value="${tree.id}" /-->
+ <!--c:param name="id" value="${tree.study.id}" /-->
+ </c:url>
+ <a href="http://www.phylowidget.org/full/?tree='http://<%=request.getServerName()%>:<%=request.getServerPort()%>${url}TB2:Tr${tree.id}'" target="myplwidget">
<img
class="iconButton"
src="<fmt:message key="icons.list"/>"
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp 2010-03-31 14:49:01 UTC (rev 662)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp 2010-03-31 18:46:29 UTC (rev 663)
@@ -14,12 +14,12 @@
export = "false">
<display:column title="" sortable="true" class="checkBoxColumn">
- <c:url var="url" value="study/tree.html">
- <c:param name="treeid" value="${tree.id}" />
- <c:param name="id" value="${tree.study.id}" />
+ <c:url var="url" value="/tree_for_phylowidget/">
+ <!--c:param name="treeid" value="${tree.id}" /-->
+ <!--c:param name="id" value="${tree.study.id}" /-->
</c:url>
<input type="checkbox" id="s-${tree.id }" name="selection" value="${tree.id }" />
- <a href="${url}" target="myplwidget">Tr${tree.id}</a>
+ <a href="http://www.phylowidget.org/full/?tree='http://<%=request.getServerName()%>:<%=request.getServerPort()%>${url}TB2:Tr${tree.id}'" target="myplwidget">Tr${tree.id}</a>
</display:column>
@@ -81,11 +81,11 @@
sortable="false"
class="iconColumn"
headerClass="iconColumn">
- <c:url var="url" value="study/tree.html">
- <c:param name="treeid" value="${tree.id}" />
- <c:param name="id" value="${tree.study.id}" />
+ <c:url var="url" value="/tree_for_phylowidget/">
+ <!--c:param name="treeid" value="${tree.id}" /-->
+ <!--c:param name="id" value="${tree.study.id}" /-->
</c:url>
- <a href="${url}" target="myplwidget">
+ <a href="http://www.phylowidget.org/full/?tree='http://<%=request.getServerName()%>:<%=request.getServerPort()%>${url}TB2:Tr${tree.id}'" target="myplwidget">
<img
class="iconButton"
src="<fmt:message key="icons.list"/>"
Added: trunk/treebase-web/src/main/webapp/WEB-INF/urlrewrite.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/urlrewrite.xml (rev 0)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/urlrewrite.xml 2010-03-31 18:46:29 UTC (rev 663)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 3.2//EN"
+ "http://tuckey.org/res/dtds/urlrewrite3.2.dtd">
+
+<!--
+
+ Configuration file for UrlRewriteFilter
+ http://tuckey.org/urlrewrite/
+
+-->
+<urlrewrite>
+
+ <rule>
+ <note>
+ The rule means that requests to /test/status/ will be redirected to /rewrite-status
+ the url will be rewritten.
+ </note>
+ <from>/tree_for_phylowidget/(.*)</from>
+ <to>/phylows/tree/$1?format=nexus</to>
+ </rule>
+
+ <!--
+ <outbound-rule>
+ <note>
+ The outbound-rule specifies that when response.encodeURL is called (if you are using JSTL c:url)
+ the url /rewrite-status will be rewritten to /test/status/.
+
+ The above rule and this outbound-rule means that end users should never see the
+ url /rewrite-status only /test/status/ both in thier location bar and in hyperlinks
+ in your pages.
+ </note>
+ <from>/rewrite-status</from>
+ <to>/test/status/</to>
+ </outbound-rule>
+ -->
+
+ <!--
+
+ INSTALLATION
+
+ in your web.xml add...
+
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ <init-param>
+ <param-name>logLevel</param-name>
+ <param-value>WARN</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ EXAMPLES
+
+ Redirect one url
+ <rule>
+ <from>/some/old/page.html</from>
+ <to type="redirect">/very/new/page.html</to>
+ </rule>
+
+ Redirect a directory
+ <rule>
+ <from>/some/olddir/(.*)</from>
+ <to type="redirect">/very/newdir/$1</to>
+ </rule>
+
+ Clean a url
+ <rule>
+ <from>/products/([0-9]+)</from>
+ <to>/products/index.jsp?product_id=$1</to>
+ </rule>
+ eg, /products/1234 will be passed on to /products/index.jsp?product_id=1234 without the user noticing.
+
+ Browser detection
+ <rule>
+ <condition name="user-agent">Mozilla/[1-4]</condition>
+ <from>/some/page.html</from>
+ <to>/some/page-for-old-browsers.html</to>
+ </rule>
+ eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older
+ browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4.
+
+ Centralised browser detection
+ <rule>
+ <condition name="user-agent">Mozilla/[1-4]</condition>
+ <set type="request" name="browser">moz</set>
+ </rule>
+ eg, all requests will be checked against the condition and if matched
+ request.setAttribute("browser", "moz") will be called.
+
+ -->
+
+</urlrewrite>
+
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/web.xml 2010-03-31 14:49:01 UTC (rev 662)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/web.xml 2010-03-31 18:46:29 UTC (rev 663)
@@ -85,8 +85,12 @@
<filter-class>org.displaytag.filter.ResponseOverrideFilter</filter-class>
</filter>
-
-
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ </filter>
+
+
<!-- ========================================================== -->
<!-- Mappings for Filters defined aboved -->
@@ -114,8 +118,13 @@
<filter-name>ResponseOverrideFilter</filter-name>
<url-pattern>*.html</url-pattern>
</filter-mapping>
+
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
-
+
<!-- ========================================================== -->
<!-- define the listener -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
