Author: ssmiweve
Date: 2008-02-28 23:14:27 +0100 (Thu, 28 Feb 2008)
New Revision: 6190
Removed:
branches/2.16/war/src/main/webapp/export/
Modified:
branches/2.16/pom.xml
branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
branches/2.16/sitemap-generator/
branches/2.16/sitemap-generator/pom.xml
branches/2.16/sitemap-generator/src/main/java/no/sesat/sitemap/SitemapGenerator.java
branches/2.16/sitemap-generator/src/main/resources/log4j.xml
branches/2.16/war/pom.xml
branches/2.16/war/src/main/webapp/WEB-INF/urlrewrite.xml
Log:
manual merging from 2.16.0
revisions 6171,6183:6189
Modified: branches/2.16/pom.xml
===================================================================
--- branches/2.16/pom.xml 2008-02-28 22:03:24 UTC (rev 6189)
+++ branches/2.16/pom.xml 2008-02-28 22:14:27 UTC (rev 6190)
@@ -119,8 +119,10 @@
<module>sitemap-spi</module>
<module>core-api</module>
<module>search-servlet-handler-spi</module>
+ <module>generic.sesam</module>
+ <!-- sitemap-generator must be after
generic.sesam-search-command-control because they both use assembly -->
+ <module>sitemap-generator</module>
<module>war</module>
- <module>generic.sesam</module>
</modules>
<build>
Modified:
branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
===================================================================
---
branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
2008-02-28 22:03:24 UTC (rev 6189)
+++
branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
2008-02-28 22:14:27 UTC (rev 6190)
@@ -93,9 +93,9 @@
EXACT_LAST (Type.FAST),
/** */
MATERIAL (Type.FAST),
- /** */
+ /** @deprecated remove. use MOVIE_TITLE TokenPredicates instead. */
MOVIE (Type.FAST),
- /** */
+ /** @deprecated remove. use EXACT_MOVIE_TITLE TokenPredicates instead. */
EXACT_MOVIE (Type.FAST),
/** */
MOVIE_TITLE(Type.FAST),
@@ -117,6 +117,7 @@
PRODUCT_BICYCLE (Type.FAST),
/** */
PRODUCT_CAR (Type.FAST),
+ /** */
EXACT_PRODUCT_CAR (Type.FAST),
/** */
PRODUCT_CHILDREN (Type.FAST),
Property changes on: branches/2.16/sitemap-generator
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/2.16/sitemap-generator/pom.xml
===================================================================
--- branches/2.16/sitemap-generator/pom.xml 2008-02-28 22:03:24 UTC (rev
6189)
+++ branches/2.16/sitemap-generator/pom.xml 2008-02-28 22:14:27 UTC (rev
6190)
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>schibstedsok</groupId>
- <artifactId>search-portal</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-kernel</artifactId>
+ <version>2.16-SNAPSHOT</version>
</parent>
- <name>SESAT Sitemap Generator</name>
+ <name>Sesat Sitemap Generator</name>
<description>
This is the project for the SESAT Sitemap generator.
</description>
@@ -46,16 +46,14 @@
</dependency>
<dependency>
- <groupId>schibstedsok</groupId>
+ <groupId>sesat</groupId>
<artifactId>sesat-sitemap-spi</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <type>jar</type>
</dependency>
</dependencies>
</project>
Modified:
branches/2.16/sitemap-generator/src/main/java/no/sesat/sitemap/SitemapGenerator.java
===================================================================
---
branches/2.16/sitemap-generator/src/main/java/no/sesat/sitemap/SitemapGenerator.java
2008-02-28 22:03:24 UTC (rev 6189)
+++
branches/2.16/sitemap-generator/src/main/java/no/sesat/sitemap/SitemapGenerator.java
2008-02-28 22:14:27 UTC (rev 6190)
@@ -38,6 +38,7 @@
* </ul>
*
* @author maek
+ * @version $Id$
*/
public final class SitemapGenerator {
@@ -101,6 +102,7 @@
* @throws IOException If the files can't be written.
*/
public SitemapGenerator(final URI site, final File dest, final URI url)
throws IOException {
+
this(new ArrayList<PageProvider>(), dest, url);
for (PageProvider provider : ServiceLoader.load(PageProvider.class,
getClassLoader(site))) {
@@ -328,7 +330,9 @@
* @todo This should really be using the site-spi, but SEARCH-3732 needs
to be resolved first.
*/
private ClassLoader getClassLoader(final URI site) throws
MalformedURLException {
+
final URL url = site.resolve("/" + site.getHost() +
"/lib/sitemap.jar").toURL();
+ LOG.info("skin's sitemap.jar at " + url);
return new URLClassLoader((new URL[] {url}));
}
Property changes on:
branches/2.16/sitemap-generator/src/main/java/no/sesat/sitemap/SitemapGenerator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/2.16/sitemap-generator/src/main/resources/log4j.xml
===================================================================
--- branches/2.16/sitemap-generator/src/main/resources/log4j.xml
2008-02-28 22:03:24 UTC (rev 6189)
+++ branches/2.16/sitemap-generator/src/main/resources/log4j.xml
2008-02-28 22:14:27 UTC (rev 6190)
@@ -3,7 +3,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="file" class="org.apache.log4j.FileAppender">
- <param name="File" value="/www/schibstedsok/sitemaps/generator.log"/>
+ <param name="File" value="generator.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d{HH\:mm\:ss,SSS}
%c{1} - %m%n"/>
</layout>
Modified: branches/2.16/war/pom.xml
===================================================================
--- branches/2.16/war/pom.xml 2008-02-28 22:03:24 UTC (rev 6189)
+++ branches/2.16/war/pom.xml 2008-02-28 22:14:27 UTC (rev 6190)
@@ -121,6 +121,12 @@
</dependency>
<dependency>
<groupId>sesat</groupId>
+ <artifactId>sesat-sitemap-generator</artifactId>
+ <version>${version}</version>
+ <classifier>jar-with-dependencies</classifier>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
<artifactId>commons-ioc</artifactId>
</dependency>
<dependency>
Modified: branches/2.16/war/src/main/webapp/WEB-INF/urlrewrite.xml
===================================================================
--- branches/2.16/war/src/main/webapp/WEB-INF/urlrewrite.xml 2008-02-28
22:03:24 UTC (rev 6189)
+++ branches/2.16/war/src/main/webapp/WEB-INF/urlrewrite.xml 2008-02-28
22:14:27 UTC (rev 6190)
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with SESAT. If not, see <http://www.gnu.org/licenses/>.
-
+ *
Document : urlrewrite.xml
Created on : 19 March 2007, 14:43
Author : mick
@@ -31,6 +31,11 @@
<rule><from>^/robots.txt$</from><to>/robots.jsp</to></rule>
<rule><from>^/psearch/(.*)$</from><to>/search/$1</to></rule>
+ <!-- makes it easy to upload google verification html files -->
+ <!-- the /export/ directory has some history behind it in that both norway
and sweden
+ use it as a apache configured location to serve off-disk static
content for each vhost.
+ But this doesn't have to be the case. the file can just as easily be
dumped into the tomcat webapps/ROOT/export directory -->
+ <rule><from>^/google(.*).html$</from><to
type="permanent-redirect">/export/google$1.html</to></rule>
<!-- Everything non-specified falls back to the default search
(unspecified c parameter) -->
<!-- We make the presumption that all the following urls (that we must
still honour) contain a second '/'
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
