Author: murdos
Date: 2009-11-03 00:01:46 +0000 (Tue, 03 Nov 2009)
New Revision: 12282
Modified:
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/urlrewrite.xml
Log:
Updated urlrewrite rules so WS version is dynamically set.
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-11-02 23:38:03 UTC (rev 12281)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-11-03 00:01:46 UTC (rev 12282)
@@ -131,7 +131,7 @@
public ResultsWriter getWriter(String fmt, String version) {
if (SearchServerServlet.RESPONSE_XML.equals(fmt)) {
- if(SearchServerServlet.VERSION_1.equals(version)) {
+ if(SearchServerServlet.WS_VERSION_1.equals(version)) {
return getXmlV1Writer();
}
else {
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-11-02 23:38:03 UTC (rev 12281)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-11-03 00:01:46 UTC (rev 12282)
@@ -55,8 +55,8 @@
final static String RESPONSE_XML = "xml";
final static String RESPONSE_HTML = "html";
- final static String VERSION_1 = "1";
- final static String VERSION_2 = "2";
+ final static String WS_VERSION_1 = "1";
+ final static String WS_VERSION_2 = "2";
final static String CHARSET = "UTF-8";
@@ -167,7 +167,7 @@
String responseVersion = request.getParameter(RequestParameter.VERSION.getName());
if (responseVersion == null || responseVersion.isEmpty()) {
- responseVersion = VERSION_2;
+ responseVersion = WS_VERSION_2;
}
Integer offset = DEFAULT_OFFSET;
Modified: search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/urlrewrite.xml
===================================================================
--- search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/urlrewrite.xml 2009-11-02 23:38:03 UTC (rev 12281)
+++ search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/urlrewrite.xml 2009-11-03 00:01:46 UTC (rev 12282)
@@ -12,10 +12,10 @@
<rule>
<note>
Matches urls like
http://localhost:8080/ws/1/artist/?query=blur&fmt=xml- and converts to
http://localhost:8080/?type=artist&query=blur&fmt=xml+ and converts to
http://localhost:8080/?type=artist&query=blur&fmt=xml&version=1 </note>
- <from>^/ws/1/(.*)/\?(.*)$</from>
- <to>/?type=$1&$2</to>
+ <from>^/ws/(\d)/(.*)/\?(.*)$</from>
+ <to>/?version=$1&type=$2&$3</to>
</rule>
<rule>
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
