Author: ssmiweve
Date: 2009-06-24 13:50:14 +0200 (Wed, 24 Jun 2009)
New Revision: 7228
Modified:
branches/2.18/core-api/pom.xml
branches/2.18/data-model-api/pom.xml
branches/2.18/data-model-javabean-impl/pom.xml
branches/2.18/generic.sesam/pom.xml
branches/2.18/pom.xml
branches/2.18/search-command-control-spi/pom.xml
branches/2.18/war/pom.xml
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
Log:
>From 2.18 Upgrade Guide
sesat-user-api expanded, sesat-user-service removed (24th June '09)
Changed API:
* sesat-user.jar is no longer bundled with ROOT.war. Therefore it must
be manually deployed or put into classpath.
* sesat-service is no longer a dependency and is completely removed
from the sesat stack (sesat-user-service-impl will be introduced with a default
BasicUserService implementation).
* ...more to come...
Modified: branches/2.18/core-api/pom.xml
===================================================================
--- branches/2.18/core-api/pom.xml 2009-05-11 10:43:29 UTC (rev 7227)
+++ branches/2.18/core-api/pom.xml 2009-06-24 11:50:14 UTC (rev 7228)
@@ -205,11 +205,6 @@
<type>jar</type>
<version>4.0.5</version>
</dependency>
- <dependency>
- <groupId>sesat</groupId>
- <artifactId>sesat-user-service</artifactId>
- <type>ejb-client</type>
- </dependency>
<!-- Testin -->
<dependency>
Modified: branches/2.18/data-model-api/pom.xml
===================================================================
--- branches/2.18/data-model-api/pom.xml 2009-05-11 10:43:29 UTC (rev
7227)
+++ branches/2.18/data-model-api/pom.xml 2009-06-24 11:50:14 UTC (rev
7228)
@@ -64,7 +64,6 @@
<dependency>
<groupId>sesat</groupId>
<artifactId>sesat-user-api</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Modified: branches/2.18/data-model-javabean-impl/pom.xml
===================================================================
--- branches/2.18/data-model-javabean-impl/pom.xml 2009-05-11 10:43:29 UTC
(rev 7227)
+++ branches/2.18/data-model-javabean-impl/pom.xml 2009-06-24 11:50:14 UTC
(rev 7228)
@@ -55,6 +55,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-user-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: branches/2.18/generic.sesam/pom.xml
===================================================================
--- branches/2.18/generic.sesam/pom.xml 2009-05-11 10:43:29 UTC (rev 7227)
+++ branches/2.18/generic.sesam/pom.xml 2009-06-24 11:50:14 UTC (rev 7228)
@@ -193,7 +193,7 @@
<!-- Login -->
<schibstedsok_remote_service_url>localhost:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
<!-- Log4j -->
<log.level>INFO</log.level>
@@ -239,7 +239,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-admin01.dev.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
@@ -281,7 +281,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-admin01.dev.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
@@ -328,7 +328,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-hamysql.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
@@ -370,7 +370,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-admin01.dev.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
@@ -412,7 +412,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-hamysql.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
@@ -457,7 +457,7 @@
<tokenevaluator.solr.serverUrl>http://sch-fast-query.osl.basefarm.net:8180/solr/</tokenevaluator.solr.serverUrl>
<schibstedsok_remote_service_url>sch-hamysql.osl.basefarm.net:1099</schibstedsok_remote_service_url>
-
<user_service_jndi_name>sesat-user/BasicUserServiceImpl/remote</user_service_jndi_name>
+
<user_service_jndi_name>sesat-user/BasicUserService/remote</user_service_jndi_name>
</properties>
</profile>
Modified: branches/2.18/pom.xml
===================================================================
--- branches/2.18/pom.xml 2009-05-11 10:43:29 UTC (rev 7227)
+++ branches/2.18/pom.xml 2009-06-24 11:50:14 UTC (rev 7228)
@@ -813,15 +813,10 @@
<artifactId>sesat-user-api</artifactId>
<type>jar</type>
<version>1.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>sesat</groupId>
- <artifactId>sesat-user-service</artifactId>
- <type>ejb-client</type>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>sesat</groupId>
<artifactId>commons-log4j</artifactId>
<version>1.5-SNAPSHOT</version>
<type>jar</type>
Modified: branches/2.18/search-command-control-spi/pom.xml
===================================================================
--- branches/2.18/search-command-control-spi/pom.xml 2009-05-11 10:43:29 UTC
(rev 7227)
+++ branches/2.18/search-command-control-spi/pom.xml 2009-06-24 11:50:14 UTC
(rev 7228)
@@ -49,6 +49,10 @@
<artifactId>commons-ioc</artifactId>
</dependency>
<dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-user-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -81,4 +85,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/2.18/war/pom.xml
===================================================================
--- branches/2.18/war/pom.xml 2009-05-11 10:43:29 UTC (rev 7227)
+++ branches/2.18/war/pom.xml 2009-06-24 11:50:14 UTC (rev 7228)
@@ -193,6 +193,11 @@
<groupId>axis</groupId>
<artifactId>axis-saaj</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-user-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified:
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
===================================================================
---
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
2009-05-11 10:43:29 UTC (rev 7227)
+++
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
2009-06-24 11:50:14 UTC (rev 7228)
@@ -35,8 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import no.sesat.search.user.BasicUser;
-import no.sesat.search.user.exception.InvalidTokenException;
-import no.sesat.search.user.service.BasicUserService;
+import no.sesat.search.user.service.InvalidTokenException;
import no.sesat.search.user.service.UserCookieUtil;
import no.sesat.search.datamodel.DataModel;
import no.sesat.search.site.config.SiteConfiguration;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
