Author: ssmiweve
Date: 2011-12-23 12:14:59 +0100 (Fri, 23 Dec 2011)
New Revision: 7310
Modified:
trunk/pom.xml
trunk/taglib/pom.xml
trunk/war/pom.xml
trunk/war/src/main/webapp/WEB-INF/web.xml
Log:
correct repository locations for jboss and ibiblio
correct versions for taglib
comment out user filter
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-31 10:27:47 UTC (rev 7309)
+++ trunk/pom.xml 2011-12-23 11:14:59 UTC (rev 7310)
@@ -650,7 +650,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</profile>
<profile>
@@ -681,7 +681,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -1000,7 +1000,7 @@
<version>2.2.3</version>
<classifier>jdk15</classifier>
</dependency>
-
+
<!-- EJB3 client -->
<dependency>
<groupId>org.jboss.javaee</groupId>
@@ -1051,7 +1051,7 @@
<repository>
<id>jboss</id>
<name>JBoss Repository for Maven2</name>
- <url>http://repository.jboss.org/maven2</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -1060,7 +1060,7 @@
<!-- Troublesome repository! Comment out locally if it hangs as it
often does -->
<id>ibiblio</id>
<name>Ibiblio</name>
- <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+ <url>http://mirrors.ibiblio.org/maven2/</url>
</repository>
</repositories>
</project>
Modified: trunk/taglib/pom.xml
===================================================================
--- trunk/taglib/pom.xml 2009-10-31 10:27:47 UTC (rev 7309)
+++ trunk/taglib/pom.xml 2011-12-23 11:14:59 UTC (rev 7310)
@@ -20,7 +20,7 @@
<parent>
<groupId>sesat</groupId>
<artifactId>sesat-kernel</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>2.19-SNAPSHOT</version>
</parent>
<artifactId>sesat-taglib</artifactId>
<packaging>jar</packaging>
@@ -34,17 +34,17 @@
<dependency>
<groupId>sesat</groupId>
<artifactId>sesat-site-spi</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>2.19-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sesat</groupId>
<artifactId>sesat-data-model-api</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>2.19-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sesat</groupId>
<artifactId>sesat-core-api</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>2.19-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/war/pom.xml
===================================================================
--- trunk/war/pom.xml 2009-10-31 10:27:47 UTC (rev 7309)
+++ trunk/war/pom.xml 2011-12-23 11:14:59 UTC (rev 7310)
@@ -102,7 +102,7 @@
<dependency>
<groupId>sesat</groupId>
<artifactId>sesat-taglib</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>${sesat.version}</version>
</dependency>
<dependency>
<groupId>sesat</groupId>
Modified: trunk/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/war/src/main/webapp/WEB-INF/web.xml 2009-10-31 10:27:47 UTC (rev
7309)
+++ trunk/war/src/main/webapp/WEB-INF/web.xml 2011-12-23 11:14:59 UTC (rev
7310)
@@ -15,31 +15,31 @@
* You should have received a copy of the GNU Affero General Public License
* along with SESAT. If not, see <http://www.gnu.org/licenses/>.
-->
-<web-app version="2.4"
-xmlns="http://java.sun.com/xml/ns/j2ee";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<web-app version="2.4"
+xmlns="http://java.sun.com/xml/ns/j2ee";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
<description>HTML front to Schibsted Søk</description>
<display-name>Schibsted Søk</display-name>
<!-- Filters -->
-
+
<filter>
<filter-name>SiteLocatorFilter</filter-name>
<filter-class>no.sesat.search.http.filters.SiteLocatorFilter</filter-class>
</filter>
-
+
<filter>
<filter-name>UrlSkinRewriteFilter</filter-name>
<filter-class>no.sesat.search.http.filters.UrlRewriteFilter</filter-class>
</filter>
-
+
<filter>
<filter-name>UrlRewriteFilter</filter-name>
<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
</filter>
-
+
<filter>
<filter-name>DataModelFilter</filter-name>
<filter-class>no.sesat.search.http.filters.DataModelFilter</filter-class>
@@ -62,17 +62,18 @@
<param-value>application</param-value>
</init-param>
</filter>
-
+
<filter>
<filter-name>SiteJspLoaderFilter</filter-name>
<filter-class>no.sesat.search.http.filters.SiteJspLoaderFilter</filter-class>
</filter>
-
+
+ <!-- Disabled by default. Enable it to plug in the user-api sesat modules.
<filter>
<filter-name>UserFilter</filter-name>
<filter-class>no.sesat.search.http.filters.UserFilter</filter-class>
- </filter>
-
+ </filter-->
+
<!-- Filter Mappings -->
<!--filter-mapping>
<filter-name>CacheFilter</filter-name>
@@ -96,13 +97,14 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
+ <!-- Disabled by default. Enable it to plug in the user-api sesat modules.
<filter-mapping>
<filter-name>UserFilter</filter-name>
<url-pattern>/search/*</url-pattern>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
- </filter-mapping>
+ </filter-mapping-->
<filter-mapping>
<filter-name>md5ProtectParameters</filter-name>
<url-pattern>/search/*</url-pattern>
@@ -143,7 +145,7 @@
</init-param>
<load-on-startup>3</load-on-startup>
</servlet>
-
+
<servlet>
<servlet-name>Log</servlet-name>
<servlet-class>no.schibstedsok.log4j.LoggingServlet</servlet-class>
@@ -162,8 +164,8 @@
<servlet-name>SendMail</servlet-name>
<servlet-class>no.sesat.search.http.servlet.SendMailServlet</servlet-class>
</servlet>
-
- <!-- Uncomment to enable DWR.
+
+ <!-- Uncomment to enable DWR.
- The dwr dependency in the pom.xml and code in DataModelWrapper.java
will also need to be uncommented. -->
<!--servlet>
<servlet-name>dwr-invoker</servlet-name>
@@ -183,17 +185,17 @@
<servlet-name>VelocityDebug</servlet-name>
<url-pattern>/servlet/VelocityDebug</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>search servlet</servlet-name>
<url-pattern>/search/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>Log</servlet-name>
<url-pattern>/servlet/Log</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<!-- Ceremonial boomerangs -->
<servlet-name>Boomerang</servlet-name>
@@ -210,7 +212,7 @@
<servlet-name>SendMail</servlet-name>
<url-pattern>/servlet/sendMail.do</url-pattern>
</servlet-mapping>
-
+
<!-- Misc -->
<welcome-file-list>
@@ -247,6 +249,6 @@
<location>/WEB-INF/jsp/503.jsp</location>
</error-page>
-
+
</web-app>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
