Author: ssmiweve
Date: 2008-01-15 14:40:48 +0100 (Tue, 15 Jan 2008)
New Revision: 5969
Modified:
trunk/generic.sesam/result-handler-control/pom.xml
trunk/generic.sesam/search-command-control/assemble/pom.xml
trunk/generic.sesam/war/pom.xml
trunk/war/pom.xml
trunk/war/src/main/java/no/sesat/search/http/dwr/DataModelWrapper.java
Log:
sesat building without fast or dwr dependencies
Modified: trunk/generic.sesam/result-handler-control/pom.xml
===================================================================
--- trunk/generic.sesam/result-handler-control/pom.xml 2008-01-14 22:24:35 UTC
(rev 5968)
+++ trunk/generic.sesam/result-handler-control/pom.xml 2008-01-15 13:40:48 UTC
(rev 5969)
@@ -84,13 +84,103 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>sesat</groupId>
-
<artifactId>generic.sesam.no-search-command-control-fast</artifactId>
- <version>${version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>include-fast</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+
<testSourceDirectory>${basedir}/src/test-fast/java</testSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-query-api</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-result-handler-config-spi</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-result-handler-config</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-result-spi</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>generic.sesam.no-result</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-search-command-config-spi</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-data-model-api</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-result-handler-control-spi</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jep</groupId>
+ <artifactId>jep</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-core-api</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-search-command-control-fast</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: trunk/generic.sesam/search-command-control/assemble/pom.xml
===================================================================
--- trunk/generic.sesam/search-command-control/assemble/pom.xml 2008-01-14
22:24:35 UTC (rev 5968)
+++ trunk/generic.sesam/search-command-control/assemble/pom.xml 2008-01-15
13:40:48 UTC (rev 5969)
@@ -90,11 +90,29 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <!-- while it would make sense to push these up into parent,
+ - it introduces a "cyclic reference" between projects in the
reactor -->
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-search-command-control-default</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-search-command-control-fast</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
<dependencies>
- <!-- while it would make sense to push these up into parent,
+ <!-- while it would make sense to push these up into parent,
- it introduces a "cyclic reference" between projects in the reactor
-->
<dependency>
<groupId>sesat</groupId>
@@ -102,13 +120,6 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>sesat</groupId>
- <artifactId>generic.sesam.no-search-command-control-fast</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
</project>
Modified: trunk/generic.sesam/war/pom.xml
===================================================================
--- trunk/generic.sesam/war/pom.xml 2008-01-14 22:24:35 UTC (rev 5968)
+++ trunk/generic.sesam/war/pom.xml 2008-01-15 13:40:48 UTC (rev 5969)
@@ -45,6 +45,71 @@
<profile><id>electron</id></profile>
<profile><id>gamma</id></profile>
<profile><id>production</id></profile>
+ <profile>
+ <id>include-fast</id>
+ <dependencies>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>sesat-resourcefeed</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>commons-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-query-transform-config</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-query-transform-control</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>generic.sesam.no-result</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-result-handler-config</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-result-handler-control</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-search-command-config</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-search-command-control</artifactId>
+ <version>${version}</version>
+ <classifier>include-fast</classifier>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>generic.sesam.no-view-config</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+ <artifactId>generic.sesam.no-view-control</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sesat</groupId>
+
<artifactId>generic.sesam.no-velocity-directives</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<dependencies>
@@ -91,7 +156,6 @@
<groupId>sesat</groupId>
<artifactId>generic.sesam.no-search-command-control</artifactId>
<version>${version}</version>
- <classifier>include-fast</classifier>
</dependency>
<dependency>
<groupId>sesat</groupId>
Modified: trunk/war/pom.xml
===================================================================
--- trunk/war/pom.xml 2008-01-14 22:24:35 UTC (rev 5968)
+++ trunk/war/pom.xml 2008-01-15 13:40:48 UTC (rev 5969)
@@ -235,12 +235,13 @@
<version>3.0-schibstedsok-r1</version>
</dependency>
+ <!-- Reference implementation provided in
no.sesat.search.http.dwr.DataModelWrapper.java
<dependency>
<groupId>dwr</groupId>
<artifactId>dwr</artifactId>
<type>jar</type>
<version>2.0.1</version>
- </dependency>
+ </dependency-->
</dependencies>
<profiles>
Modified: trunk/war/src/main/java/no/sesat/search/http/dwr/DataModelWrapper.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/dwr/DataModelWrapper.java
2008-01-14 22:24:35 UTC (rev 5968)
+++ trunk/war/src/main/java/no/sesat/search/http/dwr/DataModelWrapper.java
2008-01-15 13:40:48 UTC (rev 5969)
@@ -29,8 +29,6 @@
import no.sesat.search.result.ResultItem;
import no.sesat.search.result.ResultList;
import org.apache.log4j.Logger;
-import org.directwebremoting.WebContext;
-import org.directwebremoting.WebContextFactory;
/**
*
@@ -45,16 +43,13 @@
public static DataModel getDataModel() {
- final WebContext webContext = WebContextFactory.get();
- final HttpSession session = webContext.getSession(false);
+ HttpSession session = null;
+// Uncomment the following two codelines to enable DWR.
+// The dwr dependency in the pom.xml will also need to be uncommented.
+// final org.directwebremoting.WebContext webContext =
org.directwebremoting.WebContextFactory.get();
+// session = webContext.getSession(false);
- if (session == null) {
- return createDefaultDataModel();
- }
-
- final DataModel datamodel = (DataModel)
session.getAttribute(DataModel.KEY);
-
- return datamodel;
+ return null == session ? createDefaultDataModel() : (DataModel)
session.getAttribute(DataModel.KEY);
}
public static BrowserDataObject getBrowser() {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
