Author: ssmiweve
Date: 2007-08-21 13:24:47 +0200 (Tue, 21 Aug 2007)
New Revision: 5646
Modified:
trunk/core-api/pom.xml
trunk/data-model-api/pom.xml
trunk/httpclient-api/pom.xml
trunk/pom.xml
trunk/query-api/pom.xml
trunk/query-transform-config-spi/pom.xml
trunk/query-transform-control-spi/pom.xml
trunk/result-handler-config-spi/pom.xml
trunk/result-handler-control-spi/pom.xml
trunk/result-spi/pom.xml
trunk/run-handler-spi/pom.xml
trunk/run-transform-spi/pom.xml
trunk/search-command-config-spi/pom.xml
trunk/search-command-control-spi/pom.xml
trunk/search-servlet-handler-spi/pom.xml
trunk/site-spi/pom.xml
trunk/view-config-spi/pom.xml
trunk/view-control-spi/pom.xml
trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
Log:
collateral damage from sesat refactorings
Modified: trunk/core-api/pom.xml
===================================================================
--- trunk/core-api/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/core-api/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Run API</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/core-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/core-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/core-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/core-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/core-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/core-api</developerConnection>
</scm>
<build>
Modified: trunk/data-model-api/pom.xml
===================================================================
--- trunk/data-model-api/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/data-model-api/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT DataModel API</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/data-model-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/data-model-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/data-model-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/data-model-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/data-model-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/data-model-api</developerConnection>
</scm>
<build>
Modified: trunk/httpclient-api/pom.xml
===================================================================
--- trunk/httpclient-api/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/httpclient-api/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT HttpClient API</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/httpclient-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/http-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/http-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/httpclient-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/http-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/http-api</developerConnection>
</scm>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk</connection>
- <url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk</connection>
+ <url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk</developerConnection>
</scm>
<!-- The following provides precise handling of building profile
independant subprojects (jars)
Modified: trunk/query-api/pom.xml
===================================================================
--- trunk/query-api/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/query-api/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Query API</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/query-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/query-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-api</developerConnection>
</scm>
<build>
Modified: trunk/query-transform-config-spi/pom.xml
===================================================================
--- trunk/query-transform-config-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/query-transform-config-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Query Transform Config SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-transform-config-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/query-transform-config-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-transform-config-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-transform-config-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/query-transform-config-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-transform-config-spi</developerConnection>
</scm>
<build>
Modified: trunk/query-transform-control-spi/pom.xml
===================================================================
--- trunk/query-transform-control-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/query-transform-control-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Query Transform Control SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-transform-control-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/query-transform-control-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-transform-control-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-transform-control-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/query-transform-control-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-transform-control-spi</developerConnection>
</scm>
<build>
Modified: trunk/result-handler-config-spi/pom.xml
===================================================================
--- trunk/result-handler-config-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/result-handler-config-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Result Handler Config SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-handler-config-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/result-handler-config-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-handler-config-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-handler-config-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/result-handler-config-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-handler-config-spi</developerConnection>
</scm>
<build>
Modified: trunk/result-handler-control-spi/pom.xml
===================================================================
--- trunk/result-handler-control-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/result-handler-control-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Result Handler Control SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-handler-control-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/result-handler-control-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-handler-control-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-handler-control-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/result-handler-control-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-handler-control-spi</developerConnection>
</scm>
<build>
Modified: trunk/result-spi/pom.xml
===================================================================
--- trunk/result-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/result-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Result SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/result-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/result-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/result-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/result-spi</developerConnection>
</scm>
<build>
Modified: trunk/run-handler-spi/pom.xml
===================================================================
--- trunk/run-handler-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/run-handler-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Run Handler SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/run-handler-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/run-handler-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/run-handler-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/run-handler-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/run-handler-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/run-handler-spi</developerConnection>
</scm>
<build>
Modified: trunk/run-transform-spi/pom.xml
===================================================================
--- trunk/run-transform-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/run-transform-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Run Transform SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-run-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/query-run-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/query-run-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-run-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/query-run-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/query-run-spi</developerConnection>
</scm>
<build>
Modified: trunk/search-command-config-spi/pom.xml
===================================================================
--- trunk/search-command-config-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/search-command-config-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Search Command Config SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-command-config-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/search-command-config-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-command-config-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-command-config-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/search-command-config-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-command-config-spi</developerConnection>
</scm>
<build>
Modified: trunk/search-command-control-spi/pom.xml
===================================================================
--- trunk/search-command-control-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/search-command-control-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Search Command Control SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-command-control-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/search-command-control-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-command-control-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-command-control-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/search-command-control-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-command-control-spi</developerConnection>
</scm>
<build>
Modified: trunk/search-servlet-handler-spi/pom.xml
===================================================================
--- trunk/search-servlet-handler-spi/pom.xml 2007-08-21 11:23:37 UTC (rev
5645)
+++ trunk/search-servlet-handler-spi/pom.xml 2007-08-21 11:24:47 UTC (rev
5646)
@@ -11,12 +11,12 @@
<name>SESAT Search Servlet Transform SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-servlet-transform-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/search-servlet-transform-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/search-servlet-transform-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-servlet-transform-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/search-servlet-transform-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/search-servlet-transform-spi</developerConnection>
</scm>
<build>
Modified: trunk/site-spi/pom.xml
===================================================================
--- trunk/site-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/site-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT Site SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/site-spi</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/site-spi</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/site-spi</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/site-spi</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/site-spi</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/site-spi</developerConnection>
</scm>
<build>
Modified: trunk/view-config-spi/pom.xml
===================================================================
--- trunk/view-config-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/view-config-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT View Config SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/view-config-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/result-view-config-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/view-config-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/view-config-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/result-view-config-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/view-config-api</developerConnection>
</scm>
<build>
Modified: trunk/view-control-spi/pom.xml
===================================================================
--- trunk/view-control-spi/pom.xml 2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/view-control-spi/pom.xml 2007-08-21 11:24:47 UTC (rev 5646)
@@ -11,12 +11,12 @@
<name>SESAT View Control SPI</name>
<description>
This is the project for Schibsted Søk's search-portal application. Aka
Sesam.
- Read https://dev.sesat.no/confluence/display/TECHDEV/Setting+up+Sesam
for developing help.
+ Read
https://dev.schibstedsok.no/confluence/display/TECHDEV/Setting+up+Sesam for
developing help.
</description>
<scm>
-
<connection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/view-control-api</connection>
-
<url>https://dev.sesat.no/svn/search-portal/sesam.no/trunk/result-view-control-api</url>
-
<developerConnection>scm:svn:https://dev.sesat.no/svn/search-portal/trunk/view-control-api</developerConnection>
+
<connection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/view-control-api</connection>
+
<url>https://dev.schibstedsok.no/svn/search-portal/sesam.no/trunk/result-view-control-api</url>
+
<developerConnection>scm:svn:https://dev.schibstedsok.no/svn/search-portal/trunk/view-control-api</developerConnection>
</scm>
<build>
Modified:
trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
2007-08-21 11:23:37 UTC (rev 5645)
+++ trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
2007-08-21 11:24:47 UTC (rev 5646)
@@ -1,9 +1,8 @@
/* Copyright (2006-2007) Schibsted Søk AS
* This file is part of SESAT.
* You can use, redistribute, and/or modify it, under the terms of the SESAT
License.
- * You should have received a copy of the SESAT License along with this
program.
+ * You should have received a copy of the SESAT License along with this
program.
* If not, see https://dev.sesat.no/confluence/display/SESAT/SESAT+License
-
*
* DataModelFilter.java
*
@@ -125,11 +124,11 @@
final ParametersDataObject parametersDO =
updateDataModelForRequest(factory, httpRequest);
datamodel.setParameters(parametersDO);
-
+
if(null == datamodel.getSite() ||
!datamodel.getSite().getSite().equals(site)){
datamodel.setSite(getSiteDO(request, factory));
}
-
+
// DataModel's ControlLevel will be REQUEST_CONSTRUCTION (from
getDataModel(..))
// Increment it onwards to VIEW_CONSTRUCTION.
// SearchServlet will assign it back to REQUEST_CONSTRUCTION
if neccessary.
@@ -222,7 +221,7 @@
}
private static SiteDataObject getSiteDO(final ServletRequest request,
final DataModelFactory factory) {
-
+
final Site site = (Site) request.getAttribute(Site.NAME_KEY);
final SiteConfiguration siteConf = (SiteConfiguration)
request.getAttribute(SiteConfiguration.NAME_KEY);
@@ -237,7 +236,7 @@
final DataModelFactory factory,
final HttpServletRequest request){
- // XXX Note that we do not support String[] parameter values! this is
different to pre SESAT days
+ // Note that we do not support String[] parameter values! this is
different to pre SESAT days
final Map<String,StringDataObject> values = new
HashMap<String,StringDataObject>();
for(Enumeration<String> e = request.getParameterNames();
e.hasMoreElements(); ){
final String key = e.nextElement();
@@ -245,7 +244,7 @@
StringDataObject.class,
new DataObject.Property("string", getParameterSafely(request,
key))));
}
-
+
/* Adding cookie myChannels to parameters.
* TODO: add generic handling of cookies, or make it part of User
initailization.
*/
@@ -271,43 +270,44 @@
/** Clean out everything in the datamodel that is not flagged to be
long-lived. **/
private static void cleanDataModel(final DataModelFactory factory, final
DataModel datamodel){
-
+
for(String key : datamodel.getJunkYard().getValues().keySet()){
datamodel.getJunkYard().setValue(key, null);
}
-
+
/* Moving this into SearchServlet so the results can be accessed in
later requests */
-
+
//for(String key : datamodel.getSearches().keySet()){
// datamodel.setSearch(key, null);
//}
//datamodel.setParameters(null);
//datamodel.setQuery(null);
-
+
assert isSerializable(datamodel) : "Datamodel is not serializable!";
factory.assignControlLevel(datamodel, ControlLevel.VIEW_CONSTRUCTION);
}
private static boolean isSerializable(final DataModel datamodel) {
+
boolean retval = false;
-
+
try {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final ObjectOutputStream os = new ObjectOutputStream(baos);
-
+
LOG.info("Serializing datamodel");
os.writeObject(datamodel);
retval = true;
-
+
} catch (NotSerializableException e) {
LOG.error("Failed to serialize datamodel: " + e);
} catch (IOException e) {
LOG.error("Failed to serialize datamodel:" + e);
}
-
+
return retval;
}
-
+
/** A safer way to get parameters for the query string.
* Handles ISO-8859-1 and UTF-8 URL encodings.
*
@@ -331,11 +331,11 @@
break;
}
}
-
+
if (null != value && null != queryStringValue) {
try {
-
+
final String encodedReqValue = URLEncoder.encode(value,
"UTF-8")
.replaceAll("[+]", "%20")
.replaceAll("[*]", "%2A");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
