You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by dp...@apache.org on 2009/03/04 19:04:27 UTC
svn commit: r750090 - in /incubator/esme/trunk/server: pom.xml
src/main/scala/org/apache/esme/actor/HttpSender.scala
src/main/scala/org/apache/esme/api/RestAPI.scala
Author: dpp
Date: Wed Mar 4 18:04:26 2009
New Revision: 750090
URL: http://svn.apache.org/viewvc?rev=750090&view=rev
Log:
Updates to Lift 1.0, fixed openid4java's stupidity
Modified:
incubator/esme/trunk/server/pom.xml
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=750090&r1=750089&r2=750090&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Wed Mar 4 18:04:26 2009
@@ -40,44 +40,78 @@
</pluginRepository>
</pluginRepositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.3</version>
+ </dependency>
+
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-util</artifactId>
- <version>0.10</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-webkit</artifactId>
- <version>0.10</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-mapper</artifactId>
- <version>0.10</version>
+ <version>1.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-testkit</artifactId>
- <version>0.10</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-openid</artifactId>
- <version>0.10</version>
+ <version>1.0</version>
</dependency>
<!--
- <dependency>
- <groupId>com.socialmaterial</groupId>
- <artifactId>social</artifactId>
- <version>0.1-SNAPSHOT</version>
- </dependency>
- -->
+ <dependency>
+ <groupId>com.socialmaterial</groupId>
+ <artifactId>social</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ -->
<dependency>
<groupId>org.compass-project</groupId>
<artifactId>compass</artifactId>
@@ -100,19 +134,21 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1_3</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>1.0</version>
@@ -167,9 +203,11 @@
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
+
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
+ <version>2.9</version>
<executions>
<execution>
<goals>
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala?rev=750090&r1=750089&r2=750090&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala Wed Mar 4 18:04:26 2009
@@ -132,7 +132,7 @@
}
def httpClient = {
- val ret = new HttpClient(new SimpleHttpConnectionManager(false))
+ val ret = new HttpClient(new SimpleHttpConnectionManager())
for (host <- Props.get("http.proxyHost"))
ret.getHostConfiguration.setProxy(host,
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=750090&r1=750089&r2=750090&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala Wed Mar 4 18:04:26 2009
@@ -351,7 +351,7 @@
}
object restActor extends SessionVar[Box[RestActor]](Empty) {
- override def cleanupFunc: Box[() => Unit] = Full(() => this.is.map(_ ! ByeBye))
+ override def onShutdown(session: LiftSession) = this.is.map(_ ! ByeBye)
}