Author: dpp
Date: Wed Dec 9 13:49:50 2009
New Revision: 888802
URL: http://svn.apache.org/viewvc?rev=888802&view=rev
Log:
Made the dependency on lift-widgets explicit
Modified:
incubator/esme/trunk/server/pom.xml
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=888802&r1=888801&r2=888802&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Wed Dec 9 13:49:50 2009
@@ -117,6 +117,11 @@
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
+ <artifactId>lift-widgets</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
<artifactId>lift-mapper</artifactId>
<version>${lift.version}</version>
</dependency>
Author: rhirsch
Date: Tue Dec 8 06:04:18 2009
New Revision: 888274
URL: http://svn.apache.org/viewvc?rev=888274&view=rev
Log:
Adding legal requirements for our first release
Added:
incubator/esme/DISCLAIMER.txt
Added: incubator/esme/DISCLAIMER.txt
URL: http://svn.apache.org/viewvc/incubator/esme/DISCLAIMER.txt?rev=888274&view=auto
==============================================================================
--- incubator/esme/DISCLAIMER.txt (added)
+++ incubator/esme/DISCLAIMER.txt Tue Dec 8 06:04:18 2009
@@ -0,0 +1,6 @@
+Apache ESME is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Incubator PMC. Incubation is required of all newly accepted projects
+until a further review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other successful ASF projects.
+While incubation status is not necessarily a reflection of the completeness or stability
+of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
Author: rhirsch
Date: Mon Dec 7 11:13:52 2009
New Revision: 887886
URL: http://svn.apache.org/viewvc?rev=887886&view=rev
Log:
Decided this is better if the client is external to SVN
Removed:
incubator/esme/trunk/streaming-api-java-client/
Author: rhirsch
Date: Sun Dec 6 23:06:46 2009
New Revision: 887795
URL: http://svn.apache.org/viewvc?rev=887795&view=rev
Log:
[ESME-111] OpenID login/signon is broken
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=887795&r1=887794&r2=887795&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Sun Dec
6 23:06:46 2009
@@ -213,7 +213,8 @@
RedirectResponse(from, S responseCookies :_*)
case (Full(id), _) =>
- S.error(S.?("base_user_err_openid_not_reg",id.getIdentifier()))
+ findOrCreate(id.getIdentifier())
+ //S.error(S.?("base_user_err_openid_not_reg",id.getIdentifier()))
RedirectResponse(from, S responseCookies :_*)
@@ -245,11 +246,12 @@
}
def findOrCreate(openId: String): User =
- UserAuth.find(By(UserAuth.authType, moduleName), By(UserAuth.authKey, openId)).flatMap(_.user.obj)
match {
- case Full(user) => user
- case _ => val user = User.createAndPopulate
- UserAuth.create.authType(moduleName).user(user).authKey(openId).save
- user
+ UserAuth.find(By(UserAuth.authType, moduleName), By(UserAuth.authKey, openId)).flatMap(_.user.obj)
match {
+ case Full(user) => user
+ case _ => val user = User.createAndPopulate.nickname(openId).saveMe
+ UserAuth.create.authType(moduleName).user(user).authKey(openId).save
+ User.logUserIn(user)
+ user
}
def unapply(openId: Identifier): Option[User] =
Author: rhirsch
Date: Sun Dec 6 22:54:19 2009
New Revision: 887793
URL: http://svn.apache.org/viewvc?rev=887793&view=rev
Log:
[ESME-14] Redesign, rework, write unit tests for, and fully document API
Initial code drop of API2 client submitted by Daniel Koller
Added:
incubator/esme/trunk/streaming-api-java-client/
incubator/esme/trunk/streaming-api-java-client/src/
incubator/esme/trunk/streaming-api-java-client/src/main/
incubator/esme/trunk/streaming-api-java-client/src/main/java/
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/APITest.java
incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/ESMEServer.java
Added: incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/APITest.java
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/APITest.java?rev=887793&view=auto
==============================================================================
--- incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/APITest.java
(added)
+++ incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/APITest.java
Sun Dec 6 22:54:19 2009
@@ -0,0 +1,30 @@
+package org.apache.esme.java_lib;
+
+import java.net.URISyntaxException;
+
+
+public class APITest {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+
+ try {
+ ESMEServer s= new ESMEServer("http","localhost",8080,"/esme-server-0.3.0-SNAPSHOT","VPCABZLAPRZATETGXCPEU13W5FU2UIHR",true);
+ System.out.println(s.isConnected());
+ System.out.println("l:" + s.getLastReponse());
+ s.postMessage("hallo_ w/ #saü #sap #tag " , "", "", "", "", "");
+ System.out.println("l:" + s.getLastReponse());
+ s.disconnect();
+ } catch (URISyntaxException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+
+
+ }
+
+}
Added: incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/ESMEServer.java
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/ESMEServer.java?rev=887793&view=auto
==============================================================================
--- incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/ESMEServer.java
(added)
+++ incubator/esme/trunk/streaming-api-java-client/src/main/java/org/apache/esme/java_lib/ESMEServer.java
Sun Dec 6 22:54:19 2009
@@ -0,0 +1,180 @@
+package org.apache.esme.java_lib;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIUtils;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+public class ESMEServer {
+
+ private String protocol="",host="",path="",token ="";
+ private String lastResponse="";
+ private int port=-1;
+
+ private boolean connected= false;
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public String getToken() {
+ return token;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public HttpClient getHttpclient() {
+ return httpclient;
+ }
+
+ public void setHttpclient(HttpClient httpclient) {
+ this.httpclient = httpclient;
+ }
+
+ private HttpClient httpclient = new DefaultHttpClient();
+
+ public ESMEServer(String protocol, String host,int port, String path, String token, boolean
autoconnect
+ ) throws URISyntaxException {
+ super();
+ this.protocol = protocol;
+ this.host = host;
+ this.path = path;
+ this.token = token;
+ this.port = port;
+
+ if (autoconnect==true) { this.connect();}
+
+
+ }
+
+ public void connect() {
+ List<NameValuePair> qparams = new ArrayList<NameValuePair>();
+ qparams.add(new BasicNameValuePair("token", this.token));
+ try {
+ URI uri = URIUtils.createURI(this.protocol, this.host, this.port, this.path+"/api2/session",
+ URLEncodedUtils.format(qparams, "UTF-8"), null);
+ HttpPost httppost= new HttpPost(uri);
+ System.out.println("string: " + httppost.getURI());
+ HttpResponse logonResponse= this.httpclient.execute(httppost);
+ System.err.println(logonResponse.getStatusLine().getStatusCode());
+ System.err.println(logonResponse.getStatusLine().getReasonPhrase());
+ System.err.println(logonResponse.getStatusLine().toString());
+ if (logonResponse.getStatusLine().getStatusCode()==200) {
+ this.connected=true;
+ } else {
+ this.connected=false;
+ }
+ HttpEntity entity = logonResponse.getEntity();
+ if (entity != null) {
+ entity = new BufferedHttpEntity(entity);
+ this.lastResponse= EntityUtils.toString(entity);
+ }
+ } catch (URISyntaxException e) {
+
+ e.printStackTrace();
+ } catch (ClientProtocolException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void disconnect() {
+ this.httpclient= null;
+ }
+
+ public String getLastReponse() {
+ return this.lastResponse;
+ }
+
+ public boolean isConnected() {
+ return this.connected;
+ }
+
+ public void postMessage(String message, String via, String pool, String realm, String metadata,String
replyTo) {
+ List<NameValuePair> qparams = new ArrayList<NameValuePair>();
+ qparams.add(new BasicNameValuePair("message", message));
+ if (!(via.equals(""))) {qparams.add(new BasicNameValuePair("via", via)); }
+ if (!(pool.equals(""))) {qparams.add(new BasicNameValuePair("pool", pool)); }
+ if (!(realm.equals(""))) {qparams.add(new BasicNameValuePair("realm", realm)); }
+ if (!(metadata.equals(""))) {qparams.add(new BasicNameValuePair("metadata", metadata));
}
+
+ try {
+ URI uri = URIUtils.createURI(this.protocol, this.host, this.port, this.path+"/api2/user/messages",
URLEncodedUtils.format(qparams, "UTF-8"), null);
+ HttpPost httppost= new HttpPost(uri);
+ System.out.println("string: " + httppost.getURI());
+ HttpResponse logonResponse= this.httpclient.execute(httppost);
+ System.err.println(logonResponse.getStatusLine().getStatusCode());
+ System.err.println(logonResponse.getStatusLine().getReasonPhrase());
+ System.err.println(logonResponse.getStatusLine().toString());
+ if (logonResponse.getStatusLine().getStatusCode()==200) {
+ this.connected=true;
+ } else {
+ this.connected=false;
+ }
+ HttpEntity entity = logonResponse.getEntity();
+ if (entity != null) {
+ entity = new BufferedHttpEntity(entity);
+ this.lastResponse= EntityUtils.toString(entity);
+ }
+ } catch (URISyntaxException e) {
+
+ e.printStackTrace();
+ } catch (ClientProtocolException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+
+
+}
Author: rhirsch
Date: Sun Dec 6 22:45:02 2009
New Revision: 887790
URL: http://svn.apache.org/viewvc?rev=887790&view=rev
Log:
[ESME-137] Update existing API2 methods: response conditions other than 200 and 403
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=887790&r1=887789&r2=887790&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Sun Dec 6 22:45:02
2009
@@ -177,10 +177,13 @@
future.get(60L * 1000L)
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (act <- restActor.is ?~ "No REST actor";
+ for (act <- restActor.is ?~ S.?("base_rest_api_err_no_rest_actor");
val ignore = act ! ListenFor(future, 0 seconds);
- answer <- waitForAnswer ?~ "Didn't get an answer")
- yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+ answer <- waitForAnswer ?~ S.?("base_rest_api_err_no_answer"))
+ yield {
+ if(answer.isEmpty) (204,Map(),Empty)
+ else (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+ }
val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
if(ret.isDefined) ret else Full((403,Map(),Empty))
@@ -199,7 +202,10 @@
length <- S.param("timeout").map(_.toInt * 1000);
val ignore = act ! ListenFor(future, TimeSpan(length));
answer <- waitForAnswer ?~ "Didn't get an answer")
- yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+ yield {
+ if(answer.isEmpty) (204,Map(),Empty)
+ else (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+ }
val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
if(ret.isDefined) ret else Full((403,Map(),Empty))
@@ -230,7 +236,7 @@
for (user <- calcUser.map(_.id.is) ?~ S.?("base_rest_api_err_param_not_found", "User");
msg <- S.param("message") ?~ S.?("base_rest_api_err_missing_param", "message"))
yield {
- val from: String = S.param("via") openOr "api"
+ val from: String = S.param("via") openOr "api2"
val pool = for (poolName <- S.param("pool");
p <- AccessPool.findPool(poolName,
S.param("realm") openOr AccessPool.Native)
@@ -342,8 +348,8 @@
def addTracking(): LiftResponse = {
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- toTrack <- (S.param("track") ?~ S.?("base_rest_api_err_missing_param", "track"))
if toTrack.trim.length > 0)
+ for (user <- User.currentUser;
+ toTrack <- S.param("track") if toTrack.trim.length > 0)
yield
(200,Map(),Full(<track>{Tracking.create.user(user).regex(toTrack).save}</track>))
@@ -355,10 +361,10 @@
def removeTracking(trackId: Box[String]): LiftResponse = {
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- id <- trackId ?~ S.?("base_rest_api_err_missing_param", "id");
+ for (user <- User.currentUser;
+ id <- trackId;
track <- Tracking.find(By(Tracking.id, id.toLong),
- By(Tracking.user, user)) ?~ "Couldn't find tracking item")
+ By(Tracking.user, user)) ?~ S.?("base_rest_api_err_param_no_tracking"))
yield {
track.removed(true).save
(200,Map(),Empty)
@@ -498,12 +504,18 @@
def getConversation(conversationId: Box[String]): LiftResponse = {
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- id <- conversationId.map(toLong) ?~ S.?("base_rest_api_err_missing_param",
"id"))
- yield (200,Map(),Full(<conversation id={id.toString}>{
- Message.findAndPrime(By(Message.conversation, id),
- OrderBy(Message.id, Ascending)).map(_.toXml)
- }</conversation>))
+ for (user <- User.currentUser;
+ id <- conversationId.map(toLong))
+ yield {
+ val messages =
+ Message.findAndPrime(By(Message.conversation, id),
+ OrderBy(Message.id, Ascending))
+
+ if(messages.isEmpty)
+ (404,Map(),Empty)
+ else
+ (200,Map(),Full(<conversation id={id.toString}>{messages.map(_.toXml)}</conversation>))
+ }
val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
if(ret.isDefined) ret else Full((403,Map(),Empty))
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala?rev=887790&r1=887789&r2=887790&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala Sun Dec
6 22:45:02 2009
@@ -48,6 +48,7 @@
implicit def rackResponse(in: Box[Tuple3[Int,Map[String,String],Box[Elem]]]): LiftResponse
= in match {
case Full((200,_,xml)) => buildResponse(true, Empty, xml openOr Text(""))
+ case Full((204,_,_)) => NoContentResponse()
case Full((403,_,_)) => ForbiddenResponse()
case Full((404,_,_)) => NotFoundResponse()
case _ => InternalServerErrorResponse()
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala?rev=887790&r1=887789&r2=887790&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala Sun Dec
6 22:45:02 2009
@@ -43,12 +43,19 @@
protected def userToXml(user: User): Elem =
<user><id>{user.id.toString}</id><nickname>{user.niceName}</nickname><image>{user.image}</image><whole_name>{user.wholeName}</whole_name></user>
- protected def msgToXml(msg: Message): Elem =
-<message>
+ protected def msgToXml(msg: Message): Elem = {
+ val replyToTag: Elem =
+ if(msg.conversation.defined_?) <replyto>{msg.conversation}</replyto>
+ else <replyto></replyto>
+
+ val ret: Elem = <message>
<id>{msg.id.toString}</id>
<date>{toInternetDate(msg.when.is)}</date>
<source>{msg.source.sourceAttr.getOrElse(Text(""))}</source>
<body>{msg.body}</body>
- <tags>{msg.tags}</tags>
-</message>
+ <tags>{msg.tags}</tags>{replyToTag}
+</message>
+
+ ret
+ }
}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=887790&r1=887789&r2=887790&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Sun Dec
6 22:45:02 2009
@@ -1,6 +1,6 @@
/**
* Copyright 2008-2009 WorldWide Conferencing, LLC
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,13 +19,13 @@
* under the License.
*/
-package org.apache.esme.api
+package org.apache.esme.api
import org.specs._
import org.specs.runner.JUnit3
import org.specs.runner.ConsoleRunner
import net.liftweb.util._
-import net.liftweb.common._
+import net.liftweb.common._
import org.specs.matcher._
import Helpers._
import net.sourceforge.jwebunit.junit.WebTester
@@ -36,10 +36,10 @@
import org.apache.esme._
import model._
import net.liftweb.http._
-import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
+import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
import net.sourceforge.jwebunit.junit.WebTester
-import _root_.junit.framework.AssertionFailedError
+import _root_.junit.framework.AssertionFailedError
class Api2SpecsAsTest extends JUnit3(Api2Specs)
object Api2SpecsRunner extends ConsoleRunner(Api2Specs)
@@ -48,58 +48,63 @@
JettyTestServer.start
val baseUrl = JettyTestServer.urlFor("/api2/")
-
- val session = new LiftSession(Helpers.randomString(20), "", Empty)
- val theUser = S.initIfUninitted(session) {User.createAndPopulate.nickname("api_test").saveMe}
+ val session = new LiftSession(Helpers.randomString(20), "", Empty)
+
+ val theUser = S.initIfUninitted(session) {User.createAndPopulate.nickname("api_test").saveMe}
val token = {
val toke = AuthToken.create.user(theUser).saveMe
toke.uniqueId.is
- }
+ }
val post_session = post("session", "token" -> token)
-
+
+ def sleep(wait: Long): Box[Boolean] = {
+ Thread.sleep(wait)
+ Full(true)
+ }
+
"API2" should {
- "/session POST" in {
- "Attempt to log in with a valid token should succeed with a 200 response" in {
- for{
- session <- post_session
- } {
- (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
- session.code must be equalTo 200
- }
- }
-
- "Attempt to create session with an invalid token returns 403 response" in {
- for{
- session <- post("session", "token" -> "000000")
- } {
+ "/session POST" in {
+ "Attempt to log in with a valid token should succeed with a 200 response" in {
+ for{
+ session <- post_session
+ } {
+ (session.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
+ session.code must be equalTo 200
+ }
+ }
+
+ "Attempt to create session with an invalid token returns 403 forbidden response" in
{
+ for{
+ session <- post("session", "token" -> "000000")
+ } {
session.code must be equalTo 403
- }
- }
- }
-
- "/session GET" in {
- "with valid session" in {
- for {
- session <- post_session
+ }
+ }
+ }
+
+ "/session GET" in {
+ "with valid session" in {
+ for{
+ session <- post_session
session_response <- session.get("session")
- } {
- session_response.code must be equalTo 200
- ( session_response.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
- }
- }
-
- "with no session returns 404 (not found)" in {
- for(session_res <- get("session")) {
- session_res.code must be equalTo 404
- }
- }
+ } {
+ session_response.code must be equalTo 200
+ (session_response.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
+ }
+ }
+
+ "with no session returns 404 (not found)" in {
+ for (session_res <- get("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
}
"/session DELETE" in {
"with valid session" in {
- for {
+ for{
session <- post_session
session_del_response <- session.delete("session")
//session_response <- session.get("session")
@@ -109,16 +114,16 @@
}
}
- "with no session returns 404 (not found)" in {
- for(session_res <- delete("session")) {
- session_res.code must be equalTo 404
- }
- }
- }
+ "with no session returns 404 (not found)" in {
+ for (session_res <- delete("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
+ }
"/users GET" in {
- "with valid session" in {
- for {
+ "with valid session" in {
+ for{
session <- post_session
users <- session.get("users")
} {
@@ -126,337 +131,382 @@
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- get("users")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- get("users")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages GET" in {
- "with valid session" in {
- for {
+ "with valid session and new messages" in {
+ for{
session <- post_session
+ mess_res1 <- session.post("user/messages", "message" -> "test message")
+ timeout <- sleep(2000)
mess_res <- session.get("user/messages")
- } {
+ } {
mess_res.code must be equalTo 200
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- get("user/messages")) {
+ session_res.code must be equalTo 403
+ }
+ }
+
+
+// Should be a 304, but this response type isn't implemented in Lift yet...
+ "when no new messages exist, returns 204 (no content)" in {
+ for (session <- post_session;
+ session_res1 <- session.get("user/messages");
+ session_res <- session.get("user/messages"))
+ {
+ session_res.code must be equalTo 204
+ }
+ }
}
"/user/messages?history=10 GET" in {
"with valid session" in {
- for {
+ for{
session <- post_session
res <- session.get("user/messages?history=10")
- } {
+ } {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages?history=10")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/messages?history=10")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages?timeout=2 GET" in {
"with valid session" in {
- for {
- sess <- post_session
+ for{
+ sess <- post_session
+ mess_res1 <- sess.post("user/messages", "message" -> "test message")
res <- sess.get("user/messages?timeout=2")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages?timeout=2")) {
- session_res.code must be equalTo 403
- }
- }
- }
+ for (session_res <- get("user/messages?timeout=2")) {
+ session_res.code must be equalTo 403
+ }
+ }
+
+// Should be a 304, but this response type isn't implemented in Lift yet...
+ "when no new messages exist, returns 204 (no content)" in {
+ for (session <- post_session;
+ session_res1 <- session.get("user/messages");
+ session_res <- session.get("user/messages?timeout=2"))
+ {
+ session_res.code must be equalTo 204
+ }
+ }
+ }
"/user/messages POST" in {
"with valid session" in {
- for {
+ for{
session <- post_session
- mess_res <- session.post("user/messages","message"->"test message")
+ mess_res <- session.post("user/messages", "message" -> "test message")
} {
mess_res.code must be equalTo 200
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- post("user/messages","message"->"test message")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- post("user/messages", "message" -> "test message")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/followees")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/followees")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/followees")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.post("user/followees", "userId" -> "1")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("user/followees", "userId" -> "1")) {
- res.code must be equalTo 403
- }
- }
- }
+ for (res <- post("user/followees", "userId" -> "1")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/user/followers GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/followers")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/followers")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/followers")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/tracks")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/tracks")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/tracks")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
- res <- sess.post("user/tracks","track" -> ".*")
+ res <- sess.post("user/tracks", "track" -> ".*")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- post("user/tracks","track" -> ".*")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- post("user/tracks", "track" -> ".*")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
-/*
- * "/user/tracks/TRACKID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * create_track <- sess.post("user/tracks","track"->".*")
- * res <- sess.delete("user/tracks/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(session_res <- delete("user/tracks/1")) {
- * session_res.code must be equalTo 403
- * }
- * }
- * }
- */
+ /*
+ * "/user/tracks/TRACKID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * create_track <- sess.post("user/tracks","track"->".*")
+ * res <- sess.delete("user/tracks/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(session_res <- delete("user/tracks/1")) {
+ * session_res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
"/user/actions GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/actions")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("user/actions")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("user/actions")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/user/actions POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.post("user/actions",
- "name"->"Test action",
- "test"->"every 5 mins",
- "action"->"rss:http://blog.com/feed.rss")
- } {
- res.code must be equalTo 200
- }
+ "name" -> "Test action",
+ "test" -> "every 5 mins",
+ "action" -> "rss:http://blog.com/feed.rss")
+ } {
+ res.code must be equalTo 200
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("user/actions",
- "name"->"Test action",
- "test"->"every 5 mins",
- "action"->"rss:http://blog.com/feed.rss")) {
- res.code must be equalTo 403
- }
- }
- }
-
-/*
- * "/user/actions/ACTIONID PUT" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.put("user/actions/1","enabled"->0)
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- post("user/actions/1","enabled"->0)) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+ for (res <- post("user/actions",
+ "name" -> "Test action",
+ "test" -> "every 5 mins",
+ "action" -> "rss:http://blog.com/feed.rss")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
-/*
- * "/user/actions/ACTIONID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.delete("user/actions/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- delete("user/actions/1")) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+ /*
+ * "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1","enabled"->0)
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- post("user/actions/1","enabled"->0)) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+ /*
+ * "/user/actions/ACTIONID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.delete("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- delete("user/actions/1")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+// This is very ... shall we say ... brittle
"conversations/CONVERSATIONID GET" in {
"with valid session" in {
- for {
- sess <- post_session
- res <- sess.get("conversations/1")
+ for{
+ sess <- post_session
+ mess_res <- sess.post("user/messages", "message"->"test")
+ wait <- sleep(1000)
+ messages <- sess.get("user/messages")
+ mess_res <- sess.post("user/messages",
+ "message" -> "test_convo",
+ "replyto" -> 42)
+ wait2 <- sleep(1000)
+ messages2 <- sess.get("user/messages")
+ res <- sess.get("conversations/42")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("conversations/1")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("conversations/1")) {
+ res.code must be equalTo 403
+ }
+ }
+
+ "with an invalid conversation ID return a 404 (not found)" in {
+ for{
+ sess <- post_session
+ res <- sess.get("conversations/10000")
+ } {
+ res.code must be equalTo 404
+ }
+ }
}
"/pools GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("pools")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("pools")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("pools")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/pools POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
- res <- sess.post("pools","poolName"->"test_pool")
+ res <- sess.post("pools", "poolName" -> "test_pool")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("pools","poolName"->"test_pool")) {
- res.code must be equalTo 403
- }
- }
- }
+ for (res <- post("pools", "poolName" -> "test_pool")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/pools/POOLID/users POST" in {
-/*
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.post("pools/1/users",{"realm"->"test_realm";
- * "userId"->1;
- * "permission"->"Write"})
- * } {
- * res.code must be equalTo 200
- * }
- * }
- */
-
- "with no session returns 403 (forbidden)" in {
- for(res <- post("pools/1/users",{"realm"->"test_realm";
- "userId"->2;
- "permission"->"Write"})) {
- res.code must be equalTo 403
- }
- }
- }
- }
+ /*
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.post("pools/1/users",{"realm"->"test_realm";
+ * "userId"->1;
+ * "permission"->"Write"})
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ */
+
+ "with no session returns 403 (forbidden)" in {
+ for (res <- post("pools/1/users", {
+ "realm" -> "test_realm";
+ "userId" -> 2;
+ "permission" -> "Write"
+ })) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Author: rhirsch
Date: Sun Dec 6 19:51:39 2009
New Revision: 887754
URL: http://svn.apache.org/viewvc?rev=887754&view=rev
Log:
[ESME-142] Get tests running on an in-memory DB (H2 or Derby)
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/pom.xml
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=887754&r1=887753&r2=887754&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Sun Dec 6 19:51:39 2009
@@ -47,8 +47,14 @@
<repository>
<id>opendmk</id>
<name>Java Dynamic Management Kit</name>
- <url>http://maven.tigase.org/</url>
- </repository>
+ <url>http://maven.tigase.org/</url>
+ </repository>
+ <repository>
+ <id>Apache Repo</id>
+ <name>Apache repository for Derby 10.5.1.1</name>
+ <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
+ <layout>legacy</layout>
+ </repository>
</repositories>
<pluginRepositories>
@@ -141,17 +147,23 @@
<artifactId>compass</artifactId>
<version>${compass.version}</version>
</dependency>
-
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.2-507.jdbc3</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- </dependency>
+ <version>10.5.1.1</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.2.124</version>
+ </dependency>
+ -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=887754&r1=887753&r2=887754&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun Dec 6 19:51:39
2009
@@ -258,8 +258,8 @@
Full(dm)
} else {
val driverName = Props.mode match {
- case Props.RunModes.Test => "jdbc:derby:esme_test_db;create=true"
- case _ => "jdbc:derby:esme_db;create=true"
+ case Props.RunModes.Test => "jdbc:derby:memory:esme_test_db;create=true"
+ case _ => "jdbc:derby:memory:esme_db;create=true"
}
val dm = DriverManager.getConnection(driverName)
Author: rhirsch
Date: Sun Dec 6 19:29:22 2009
New Revision: 887750
URL: http://svn.apache.org/viewvc?rev=887750&view=rev
Log:
[ESME-14] Redesign, rework, write unit tests for, and fully document API
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=887750&r1=887749&r2=887750&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Sun Dec 6 19:29:22
2009
@@ -177,9 +177,9 @@
future.get(60L * 1000L)
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (act <- restActor.is ?~ S.?("base_rest_api_err_no_rest_actor");
+ for (act <- restActor.is ?~ "No REST actor";
val ignore = act ! ListenFor(future, 0 seconds);
- answer <- waitForAnswer ?~ S.?("base_rest_api_err_no_answer"))
+ answer <- waitForAnswer ?~ "Didn't get an answer")
yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
@@ -358,7 +358,7 @@
for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
id <- trackId ?~ S.?("base_rest_api_err_missing_param", "id");
track <- Tracking.find(By(Tracking.id, id.toLong),
- By(Tracking.user, user)) ?~ S.?("base_rest_api_err_param_no_tracking"))
+ By(Tracking.user, user)) ?~ "Couldn't find tracking item")
yield {
track.removed(true).save
(200,Map(),Empty)
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala?rev=887750&r1=887749&r2=887750&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala Sun Dec
6 19:29:22 2009
@@ -67,6 +67,6 @@
protected def buildResponse(success: Boolean, msg: Box[NodeSeq],
body: NodeSeq): LiftResponse =
- XmlResponse(createTag(body))
+ XmlResponse(createTag(body))
}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=887750&r1=887749&r2=887750&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Sun Dec
6 19:29:22 2009
@@ -1,6 +1,6 @@
/**
* Copyright 2008-2009 WorldWide Conferencing, LLC
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,13 +19,13 @@
* under the License.
*/
-package org.apache.esme.api
+package org.apache.esme.api
import org.specs._
import org.specs.runner.JUnit3
import org.specs.runner.ConsoleRunner
import net.liftweb.util._
-import net.liftweb.common._
+import net.liftweb.common._
import org.specs.matcher._
import Helpers._
import net.sourceforge.jwebunit.junit.WebTester
@@ -36,10 +36,10 @@
import org.apache.esme._
import model._
import net.liftweb.http._
-import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
+import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
import net.sourceforge.jwebunit.junit.WebTester
-import _root_.junit.framework.AssertionFailedError
+import _root_.junit.framework.AssertionFailedError
class Api2SpecsAsTest extends JUnit3(Api2Specs)
object Api2SpecsRunner extends ConsoleRunner(Api2Specs)
@@ -48,58 +48,58 @@
JettyTestServer.start
val baseUrl = JettyTestServer.urlFor("/api2/")
-
+
val session = new LiftSession(Helpers.randomString(20), "", Empty)
val theUser = S.initIfUninitted(session) {User.createAndPopulate.nickname("api_test").saveMe}
val token = {
val toke = AuthToken.create.user(theUser).saveMe
toke.uniqueId.is
- }
+ }
val post_session = post("session", "token" -> token)
-
+
"API2" should {
- "/session POST" in {
- "Attempt to log in with a valid token should succeed with a 200 response" in {
- for{
- session <- post_session
- } {
- (session.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
- session.code must be equalTo 200
- }
- }
-
- "Attempt to create session with an invalid token returns 403 response" in {
- for{
- session <- post("session", "token" -> "000000")
- } {
+ "/session POST" in {
+ "Attempt to log in with a valid token should succeed with a 200 response" in {
+ for{
+ session <- post_session
+ } {
+ (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
+ session.code must be equalTo 200
+ }
+ }
+
+ "Attempt to create session with an invalid token returns 403 response" in {
+ for{
+ session <- post("session", "token" -> "000000")
+ } {
session.code must be equalTo 403
- }
- }
- }
-
- "/session GET" in {
- "with valid session" in {
- for{
- session <- post_session
+ }
+ }
+ }
+
+ "/session GET" in {
+ "with valid session" in {
+ for {
+ session <- post_session
session_response <- session.get("session")
- } {
- session_response.code must be equalTo 200
- (session_response.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
- }
- }
-
- "with no session returns 404 (not found)" in {
- for (session_res <- get("session")) {
- session_res.code must be equalTo 404
- }
- }
+ } {
+ session_response.code must be equalTo 200
+ ( session_response.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
+ }
+ }
+
+ "with no session returns 404 (not found)" in {
+ for(session_res <- get("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
}
"/session DELETE" in {
"with valid session" in {
- for{
+ for {
session <- post_session
session_del_response <- session.delete("session")
//session_response <- session.get("session")
@@ -109,16 +109,16 @@
}
}
- "with no session returns 404 (not found)" in {
- for (session_res <- delete("session")) {
- session_res.code must be equalTo 404
- }
- }
- }
+ "with no session returns 404 (not found)" in {
+ for(session_res <- delete("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
+ }
"/users GET" in {
- "with valid session" in {
- for{
+ "with valid session" in {
+ for {
session <- post_session
users <- session.get("users")
} {
@@ -126,16 +126,16 @@
}
}
- "with no session returns 403 (forbidden)" in {
- for (session_res <- get("users")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("users")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages GET" in {
"with valid session" in {
- for{
+ for {
session <- post_session
mess_res <- session.get("user/messages")
} {
@@ -143,322 +143,320 @@
}
}
- "with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/messages")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/messages")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages?history=10 GET" in {
"with valid session" in {
- for{
+ for {
session <- post_session
res <- session.get("user/messages?history=10")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/messages?history=10")) {
- session_res.code must be equalTo 403
- }
- }
+ for(session_res <- get("user/messages?history=10")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages?timeout=2 GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("user/messages?timeout=2")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/messages?timeout=2")) {
- session_res.code must be equalTo 403
- }
- }
- }
+ for(session_res <- get("user/messages?timeout=2")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
"/user/messages POST" in {
"with valid session" in {
- for{
+ for {
session <- post_session
- mess_res <- session.post("user/messages", "message" -> "test message")
+ mess_res <- session.post("user/messages","message"->"test message")
} {
mess_res.code must be equalTo 200
}
}
- "with no session returns 403 (forbidden)" in {
- for (session_res <- post("user/messages", "message" -> "test message")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- post("user/messages","message"->"test message")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("user/followees")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/followees")) {
- session_res.code must be equalTo 403
- }
- }
+ for(session_res <- get("user/followees")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees POST" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.post("user/followees", "userId" -> "1")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- post("user/followees", "userId" -> "1")) {
- res.code must be equalTo 403
- }
- }
- }
+ for(res <- post("user/followees", "userId" -> "1")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/user/followers GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("user/followers")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/followers")) {
- session_res.code must be equalTo 403
- }
- }
+ for(session_res <- get("user/followers")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("user/tracks")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- get("user/tracks")) {
- session_res.code must be equalTo 403
- }
- }
+ for(session_res <- get("user/tracks")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks POST" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
- res <- sess.post("user/tracks", "track" -> ".*")
+ res <- sess.post("user/tracks","track" -> ".*")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (session_res <- post("user/tracks", "track" -> ".*")) {
- session_res.code must be equalTo 403
- }
- }
+ for(session_res <- post("user/tracks","track" -> ".*")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
- /*
- * "/user/tracks/TRACKID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * create_track <- sess.post("user/tracks","track"->".*")
- * res <- sess.delete("user/tracks/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(session_res <- delete("user/tracks/1")) {
- * session_res.code must be equalTo 403
- * }
- * }
- * }
- */
+/*
+ * "/user/tracks/TRACKID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * create_track <- sess.post("user/tracks","track"->".*")
+ * res <- sess.delete("user/tracks/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(session_res <- delete("user/tracks/1")) {
+ * session_res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
"/user/actions GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("user/actions")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- get("user/actions")) {
- res.code must be equalTo 403
- }
- }
+ for(res <- get("user/actions")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/user/actions POST" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.post("user/actions",
- "name" -> "Test action",
- "test" -> "every 5 mins",
- "action" -> "rss:http://blog.com/feed.rss")
- } {
- res.code must be equalTo 200
- }
+ "name"->"Test action",
+ "test"->"every 5 mins",
+ "action"->"rss:http://blog.com/feed.rss")
+ } {
+ res.code must be equalTo 200
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- post("user/actions",
- "name" -> "Test action",
- "test" -> "every 5 mins",
- "action" -> "rss:http://blog.com/feed.rss")) {
- res.code must be equalTo 403
- }
- }
- }
+ for(res <- post("user/actions",
+ "name"->"Test action",
+ "test"->"every 5 mins",
+ "action"->"rss:http://blog.com/feed.rss")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+/*
+ * "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1","enabled"->0)
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- post("user/actions/1","enabled"->0)) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
- /*
- * "/user/actions/ACTIONID PUT" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.put("user/actions/1","enabled"->0)
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- post("user/actions/1","enabled"->0)) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
-
- /*
- * "/user/actions/ACTIONID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.delete("user/actions/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- delete("user/actions/1")) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+/*
+ * "/user/actions/ACTIONID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.delete("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- delete("user/actions/1")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
"conversations/CONVERSATIONID GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("conversations/1")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- get("conversations/1")) {
- res.code must be equalTo 403
- }
- }
+ for(res <- get("conversations/1")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/pools GET" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
res <- sess.get("pools")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- get("pools")) {
- res.code must be equalTo 403
- }
- }
+ for(res <- get("pools")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/pools POST" in {
"with valid session" in {
- for{
+ for {
sess <- post_session
- res <- sess.post("pools", "poolName" -> "test_pool")
+ res <- sess.post("pools","poolName"->"test_pool")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for (res <- post("pools", "poolName" -> "test_pool")) {
- res.code must be equalTo 403
- }
- }
- }
+ for(res <- post("pools","poolName"->"test_pool")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/pools/POOLID/users POST" in {
- /*
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.post("pools/1/users",{"realm"->"test_realm";
- * "userId"->1;
- * "permission"->"Write"})
- * } {
- * res.code must be equalTo 200
- * }
- * }
- */
-
- "with no session returns 403 (forbidden)" in {
- for (res <- post("pools/1/users", {
- "realm" -> "test_realm";
- "userId" -> 2;
- "permission" -> "Write"
- })) {
- res.code must be equalTo 403
- }
- }
- }
- }
+/*
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.post("pools/1/users",{"realm"->"test_realm";
+ * "userId"->1;
+ * "permission"->"Write"})
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ */
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- post("pools/1/users",{"realm"->"test_realm";
+ "userId"->2;
+ "permission"->"Write"})) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Author: vdichev
Date: Sat Dec 5 22:26:21 2009
New Revision: 887600
URL: http://svn.apache.org/viewvc?rev=887600&view=rev
Log:
Skip messages in pools in TwitterAPI
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=887600&r1=887599&r2=887600&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Sat Dec
5 22:26:21 2009
@@ -169,6 +169,7 @@
def userData(user: User) = {
val lastMsg = Message.findAll(By(Message.author, user),
+ By(Message.pool, Empty),
OrderBy(Message.id, Descending),
MaxRows(1))
userAttributes(user) +
@@ -200,6 +201,7 @@
def userTimeline(user: User): TwitterResponse = {
val statusList =
Message.findAll(By(Message.author, user),
+ By(Message.pool, Empty),
MaxRows(20),
OrderBy(Message.id, Descending)).
map(msgData _)
@@ -235,7 +237,8 @@
def publicTimeline(): Box[TwitterResponse] = {
val statusList =
Message.findAll(OrderBy(Message.id, Descending),
- MaxRows(20)).
+ MaxRows(20),
+ By(Message.pool, Empty)).
map(msgData _)
Full(Right(Map("statuses" -> ("status", statusList) )))
}
Author: vdichev
Date: Sat Dec 5 22:01:11 2009
New Revision: 887596
URL: http://svn.apache.org/viewvc?rev=887596&view=rev
Log:
Fix HttpBasicAuthentication for Twitter API
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=887596&r1=887595&r2=887596&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sat Dec 5 22:01:11
2009
@@ -149,7 +149,7 @@
LiftRules.dispatch.prepend(API2.dispatch)
LiftRules.httpAuthProtectedResource.prepend {
- case (ParsePath(TwitterAPI.ApiPath :: _, _, _, _)) => Full(AuthRole("user"))
+ case ParsePath(l, _, _, _) if l startsWith TwitterAPI.ApiPath => Full(AuthRole("user"))
}
LiftRules.authentication = TwitterAPI.twitterAuth
Author: dpp
Date: Thu Dec 3 22:50:53 2009
New Revision: 886971
URL: http://svn.apache.org/viewvc?rev=886971&view=rev
Log:
Added a session so Users can be created outside an S context
Modified:
incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala?rev=886971&r1=886970&r2=886971&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/JettySetup.scala Thu Dec 3
22:50:53 2009
@@ -62,7 +62,11 @@
lazy val start = {
server_.start()
- User.create.nickname("hash").save
+ val session = new LiftSession(Helpers.randomString(20), "", Empty)
+
+ S.initIfUninitted(session) {
+ User.create.nickname("hash").save
+ }
}
def stop() = {
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=886971&r1=886970&r2=886971&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Thu Dec
3 22:50:53 2009
@@ -1,6 +1,6 @@
/**
* Copyright 2008-2009 WorldWide Conferencing, LLC
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,13 +19,13 @@
* under the License.
*/
-package org.apache.esme.api
+package org.apache.esme.api
import org.specs._
import org.specs.runner.JUnit3
import org.specs.runner.ConsoleRunner
import net.liftweb.util._
-import net.liftweb.common._
+import net.liftweb.common._
import org.specs.matcher._
import Helpers._
import net.sourceforge.jwebunit.junit.WebTester
@@ -36,10 +36,10 @@
import org.apache.esme._
import model._
import net.liftweb.http._
-import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
+import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
import net.sourceforge.jwebunit.junit.WebTester
-import _root_.junit.framework.AssertionFailedError
+import _root_.junit.framework.AssertionFailedError
class Api2SpecsAsTest extends JUnit3(Api2Specs)
object Api2SpecsRunner extends ConsoleRunner(Api2Specs)
@@ -48,56 +48,58 @@
JettyTestServer.start
val baseUrl = JettyTestServer.urlFor("/api2/")
-
- val theUser = User.createAndPopulate.nickname("api_test").saveMe
+
+ val session = new LiftSession(Helpers.randomString(20), "", Empty)
+
+ val theUser = S.initIfUninitted(session) {User.createAndPopulate.nickname("api_test").saveMe}
val token = {
val toke = AuthToken.create.user(theUser).saveMe
toke.uniqueId.is
- }
+ }
val post_session = post("session", "token" -> token)
-
+
"API2" should {
- "/session POST" in {
- "Attempt to log in with a valid token should succeed with a 200 response" in {
- for{
- session <- post_session
- } {
- (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
- session.code must be equalTo 200
- }
- }
-
- "Attempt to create session with an invalid token returns 403 response" in {
- for{
- session <- post("session", "token" -> "000000")
- } {
+ "/session POST" in {
+ "Attempt to log in with a valid token should succeed with a 200 response" in {
+ for{
+ session <- post_session
+ } {
+ (session.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
+ session.code must be equalTo 200
+ }
+ }
+
+ "Attempt to create session with an invalid token returns 403 response" in {
+ for{
+ session <- post("session", "token" -> "000000")
+ } {
session.code must be equalTo 403
- }
- }
- }
-
- "/session GET" in {
- "with valid session" in {
- for {
- session <- post_session
+ }
+ }
+ }
+
+ "/session GET" in {
+ "with valid session" in {
+ for{
+ session <- post_session
session_response <- session.get("session")
- } {
- session_response.code must be equalTo 200
- ( session_response.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
- }
- }
-
- "with no session returns 404 (not found)" in {
- for(session_res <- get("session")) {
- session_res.code must be equalTo 404
- }
- }
+ } {
+ session_response.code must be equalTo 200
+ (session_response.xml \ "session" \ "user" \ "id").text must be equalTo (theUser.id.toString)
+ }
+ }
+
+ "with no session returns 404 (not found)" in {
+ for (session_res <- get("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
}
"/session DELETE" in {
"with valid session" in {
- for {
+ for{
session <- post_session
session_del_response <- session.delete("session")
//session_response <- session.get("session")
@@ -107,16 +109,16 @@
}
}
- "with no session returns 404 (not found)" in {
- for(session_res <- delete("session")) {
- session_res.code must be equalTo 404
- }
- }
- }
+ "with no session returns 404 (not found)" in {
+ for (session_res <- delete("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
+ }
"/users GET" in {
- "with valid session" in {
- for {
+ "with valid session" in {
+ for{
session <- post_session
users <- session.get("users")
} {
@@ -124,16 +126,16 @@
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- get("users")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- get("users")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages GET" in {
"with valid session" in {
- for {
+ for{
session <- post_session
mess_res <- session.get("user/messages")
} {
@@ -141,320 +143,322 @@
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- get("user/messages")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages?history=10 GET" in {
"with valid session" in {
- for {
+ for{
session <- post_session
res <- session.get("user/messages?history=10")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages?history=10")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/messages?history=10")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/messages?timeout=2 GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/messages?timeout=2")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/messages?timeout=2")) {
- session_res.code must be equalTo 403
- }
- }
- }
+ for (session_res <- get("user/messages?timeout=2")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
"/user/messages POST" in {
"with valid session" in {
- for {
+ for{
session <- post_session
- mess_res <- session.post("user/messages","message"->"test message")
+ mess_res <- session.post("user/messages", "message" -> "test message")
} {
mess_res.code must be equalTo 200
}
}
- "with no session returns 403 (forbidden)" in {
- for(session_res <- post("user/messages","message"->"test message")) {
- session_res.code must be equalTo 403
- }
- }
+ "with no session returns 403 (forbidden)" in {
+ for (session_res <- post("user/messages", "message" -> "test message")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/followees")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/followees")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/followees")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/followees POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.post("user/followees", "userId" -> "1")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("user/followees", "userId" -> "1")) {
- res.code must be equalTo 403
- }
- }
- }
+ for (res <- post("user/followees", "userId" -> "1")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/user/followers GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/followers")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/followers")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/followers")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/tracks")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- get("user/tracks")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- get("user/tracks")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
"/user/tracks POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
- res <- sess.post("user/tracks","track" -> ".*")
+ res <- sess.post("user/tracks", "track" -> ".*")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(session_res <- post("user/tracks","track" -> ".*")) {
- session_res.code must be equalTo 403
- }
- }
+ for (session_res <- post("user/tracks", "track" -> ".*")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
-/*
- * "/user/tracks/TRACKID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * create_track <- sess.post("user/tracks","track"->".*")
- * res <- sess.delete("user/tracks/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(session_res <- delete("user/tracks/1")) {
- * session_res.code must be equalTo 403
- * }
- * }
- * }
- */
+ /*
+ * "/user/tracks/TRACKID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * create_track <- sess.post("user/tracks","track"->".*")
+ * res <- sess.delete("user/tracks/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(session_res <- delete("user/tracks/1")) {
+ * session_res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
"/user/actions GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("user/actions")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("user/actions")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("user/actions")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/user/actions POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.post("user/actions",
- "name"->"Test action",
- "test"->"every 5 mins",
- "action"->"rss:http://blog.com/feed.rss")
- } {
- res.code must be equalTo 200
- }
+ "name" -> "Test action",
+ "test" -> "every 5 mins",
+ "action" -> "rss:http://blog.com/feed.rss")
+ } {
+ res.code must be equalTo 200
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("user/actions",
- "name"->"Test action",
- "test"->"every 5 mins",
- "action"->"rss:http://blog.com/feed.rss")) {
- res.code must be equalTo 403
- }
- }
- }
-
-/*
- * "/user/actions/ACTIONID PUT" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.put("user/actions/1","enabled"->0)
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- post("user/actions/1","enabled"->0)) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+ for (res <- post("user/actions",
+ "name" -> "Test action",
+ "test" -> "every 5 mins",
+ "action" -> "rss:http://blog.com/feed.rss")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
-/*
- * "/user/actions/ACTIONID DELETE" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.delete("user/actions/1")
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- delete("user/actions/1")) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+ /*
+ * "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1","enabled"->0)
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- post("user/actions/1","enabled"->0)) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+ /*
+ * "/user/actions/ACTIONID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.delete("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- delete("user/actions/1")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
"conversations/CONVERSATIONID GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("conversations/1")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("conversations/1")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("conversations/1")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/pools GET" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
res <- sess.get("pools")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- get("pools")) {
- res.code must be equalTo 403
- }
- }
+ for (res <- get("pools")) {
+ res.code must be equalTo 403
+ }
+ }
}
"/pools POST" in {
"with valid session" in {
- for {
+ for{
sess <- post_session
- res <- sess.post("pools","poolName"->"test_pool")
+ res <- sess.post("pools", "poolName" -> "test_pool")
} {
res.code must be equalTo 200
- }
+ }
}
"with no session returns 403 (forbidden)" in {
- for(res <- post("pools","poolName"->"test_pool")) {
- res.code must be equalTo 403
- }
- }
- }
+ for (res <- post("pools", "poolName" -> "test_pool")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
"/pools/POOLID/users POST" in {
-/*
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.post("pools/1/users",{"realm"->"test_realm";
- * "userId"->1;
- * "permission"->"Write"})
- * } {
- * res.code must be equalTo 200
- * }
- * }
- */
-
- "with no session returns 403 (forbidden)" in {
- for(res <- post("pools/1/users",{"realm"->"test_realm";
- "userId"->2;
- "permission"->"Write"})) {
- res.code must be equalTo 403
- }
- }
- }
- }
+ /*
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.post("pools/1/users",{"realm"->"test_realm";
+ * "userId"->1;
+ * "permission"->"Write"})
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ */
+
+ "with no session returns 403 (forbidden)" in {
+ for (res <- post("pools/1/users", {
+ "realm" -> "test_realm";
+ "userId" -> 2;
+ "permission" -> "Write"
+ })) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala?rev=886971&r1=886970&r2=886971&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/ApiTest.scala Thu Dec
3 22:50:53 2009
@@ -45,7 +45,7 @@
object ApiSpecsRunner extends ConsoleRunner(ApiSpecs)
object ApiSpecs extends Specification with TestKit {
- JettyTestServer.start
+ JettyTestServer.start
val baseUrl = JettyTestServer.urlFor("")
@@ -53,7 +53,10 @@
def fail(msg: String): Nothing = ApiSpecs.this.fail(msg)
}
- val theUser = User.createAndPopulate.nickname("api_test").saveMe
+ val session = new LiftSession(Helpers.randomString(20), "", Empty)
+
+ val theUser = S.initIfUninitted(session) {User.createAndPopulate.nickname("api_test").saveMe}
+
val token = {
val toke = AuthToken.create.user(theUser).saveMe
toke.uniqueId.is
@@ -88,6 +91,6 @@
}
-
+
}
Author: akpetteroe
Date: Tue Dec 1 15:15:14 2009
New Revision: 885786
URL: http://svn.apache.org/viewvc?rev=885786&view=rev
Log:
The new HTML templates
Added:
incubator/esme/branches/new-ui/src/main/webapp/images/Thumbs.db (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/avatar1.jpg (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/avatar2.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-back.jpg (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-box-right.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-home.jpg (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-main-header.jpg (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-right-back.jpg (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-search.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-tabs.png (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/bg-update.png (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/btn-search.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/btn-signon.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/btn-signout.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/btn-signup.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/btn-update.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/esme-logo.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading-bg.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading-left.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading-right.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading.png (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/heading1.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/line.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/login-bg.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/login-bot.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/login-top.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/images/tab.gif (with props)
incubator/esme/branches/new-ui/src/main/webapp/inside.html (with props)
incubator/esme/branches/new-ui/src/main/webapp/src/
incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc (with props)
incubator/esme/branches/new-ui/src/main/webapp/src/style.css (with props)
incubator/esme/branches/new-ui/src/main/webapp/tabs.html (with props)
incubator/esme/branches/new-ui/src/main/webapp/tabs2.html (with props)
incubator/esme/branches/new-ui/src/main/webapp/tabs3.html (with props)
incubator/esme/branches/new-ui/src/main/webapp/tags.html (with props)
Removed:
incubator/esme/branches/new-ui/src/main/webapp/WEB-INF/
incubator/esme/branches/new-ui/src/main/webapp/action_view/
incubator/esme/branches/new-ui/src/main/webapp/auth_view/
incubator/esme/branches/new-ui/src/main/webapp/images/bg-i.png
incubator/esme/branches/new-ui/src/main/webapp/images/bg-left.png
incubator/esme/branches/new-ui/src/main/webapp/images/bg-m.png
incubator/esme/branches/new-ui/src/main/webapp/images/bg-right.png
incubator/esme/branches/new-ui/src/main/webapp/images/bg-right1.png
incubator/esme/branches/new-ui/src/main/webapp/images/bg-t.png
incubator/esme/branches/new-ui/src/main/webapp/images/btn-send-m.png
incubator/esme/branches/new-ui/src/main/webapp/images/btn-sign-in.png
incubator/esme/branches/new-ui/src/main/webapp/images/delete.png
incubator/esme/branches/new-ui/src/main/webapp/images/esme-blue.png
incubator/esme/branches/new-ui/src/main/webapp/images/esme.png
incubator/esme/branches/new-ui/src/main/webapp/images/favicon.png
incubator/esme/branches/new-ui/src/main/webapp/images/img-1.png
incubator/esme/branches/new-ui/src/main/webapp/images/mail.png
incubator/esme/branches/new-ui/src/main/webapp/images/send-message.png
incubator/esme/branches/new-ui/src/main/webapp/images/sh-a.png
incubator/esme/branches/new-ui/src/main/webapp/images/sh-b.png
incubator/esme/branches/new-ui/src/main/webapp/images/sh-r.png
incubator/esme/branches/new-ui/src/main/webapp/images/sh-t.png
incubator/esme/branches/new-ui/src/main/webapp/images/sign-on.png
incubator/esme/branches/new-ui/src/main/webapp/info_view/
incubator/esme/branches/new-ui/src/main/webapp/pools_view/
incubator/esme/branches/new-ui/src/main/webapp/scripts/
incubator/esme/branches/new-ui/src/main/webapp/signup.html
incubator/esme/branches/new-ui/src/main/webapp/static/
incubator/esme/branches/new-ui/src/main/webapp/style/
incubator/esme/branches/new-ui/src/main/webapp/templates-hidden/
incubator/esme/branches/new-ui/src/main/webapp/track_view/
incubator/esme/branches/new-ui/src/main/webapp/user_template/
Modified:
incubator/esme/branches/new-ui/src/main/webapp/index.html
Added: incubator/esme/branches/new-ui/src/main/webapp/images/Thumbs.db
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/Thumbs.db?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/Thumbs.db
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/Thumbs.db
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/avatar1.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/avatar1.jpg?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/avatar1.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/avatar1.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/avatar2.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/avatar2.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/avatar2.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/avatar2.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-back.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-back.jpg?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-back.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-back.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-box-right.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-box-right.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-box-right.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-box-right.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-home.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-home.jpg?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-home.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-home.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-main-header.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-main-header.jpg?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-main-header.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-main-header.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-right-back.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-right-back.jpg?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-right-back.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-right-back.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-search.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-search.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-search.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-search.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-tabs.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-tabs.png?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-tabs.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-tabs.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/bg-update.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/bg-update.png?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-update.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/bg-update.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/btn-search.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/btn-search.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-search.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-search.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signon.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/btn-signon.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signon.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signon.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signout.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/btn-signout.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signout.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signout.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signup.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/btn-signup.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signup.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-signup.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/btn-update.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/btn-update.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-update.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/btn-update.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/esme-logo.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/esme-logo.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/esme-logo.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/esme-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading-bg.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading-bg.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-bg.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-bg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading-left.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading-left.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-left.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-left.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading-right.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading-right.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-right.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading-right.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading.png?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/heading1.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/heading1.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading1.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/heading1.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/line.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/line.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/line.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/line.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/login-bg.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/login-bg.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-bg.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-bg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/login-bot.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/login-bot.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-bot.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-bot.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/login-top.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/login-top.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-top.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/login-top.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/new-ui/src/main/webapp/images/tab.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/images/tab.gif?rev=885786&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/tab.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/esme/branches/new-ui/src/main/webapp/images/tab.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/esme/branches/new-ui/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/index.html?rev=885786&r1=885785&r2=885786&view=diff
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/index.html (original)
+++ incubator/esme/branches/new-ui/src/main/webapp/index.html Tue Dec 1 15:15:14 2009
@@ -1,19 +1,153 @@
-<lift:UserSnip.loggedIn>
- <logged:in>
- <lift:surround with="message" at="content"/>
- </logged:in>
- <logged:out>
- <lift:surround with="default" at="content">
- <div>
- <fieldset>
- <legend>
- <lift:loc>ui_default_conversation</lift:loc>
- </legend>
- <div style="height: 500px; overflow: auto">
- <lift:comet type="PublicTimeline"/>
- </div>
- </fieldset>
- </div>
- </lift:surround>
- </logged:out>
-</lift:UserSnip.loggedIn>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="home">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu"><a href="/"><img src="images/btn-signup.gif" alt="" /></a></div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+ <!---BLUE HEADER-->
+ <div id="container-2nd-level-bg">
+ <div id="container-2nd-level">
+ <h1><span>Getting Started on ESME</span></h1>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris eu est faucibus laoreet. Maecenas pulvinar ornare eros non hendrerit. Aliquam rutrum, mauris ut consectetur placerat, magna neque pulvinar eros, sed pretium purus turpis fermentum ligula. Vestibulum erat elit, dictum non hendrerit in, aliquet posuere augue. Aliquam mauris dolor, luctus sit amet luctus vitae, viverra tempor est. Donec metus lorem, hendrerit in venenatis ac.
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris eu est faucibus laoreet. </p>
+ </div><!--container-2nd-level-->
+ </div><!--container-2nd-level-bg-->
+ <!--END BLUE HEADER-->
+
+ <div class="gray-box">
+ <h1>Now on ESME</h1>
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="tag"><a href="">mac</a>, <a href="">design</a>, <a href="">graphics</a>, <a href="">photoshop</a>, <a href="">cs3</a></div>
+ <div class="info"><a href="">Nickname</a> 3 hours ago</div>
+ </div>
+ </div><!--gray-box-->
+
+ <div class="tags-box">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+</div><!--left-->
+<div id="right">
+
+ <div id="login-box">
+ <div class="top-login"></div>
+ <div class="mid-login">
+ <form action="" method="post" >
+ <div class="form">
+ <div class="post-form-row">
+ <label>Username</label>
+ <input type="text" name="username" value="" class="inputBox2"/><!--narrow input field-->
+ </div>
+ <div class="post-form-row">
+
+ <label>Password</label>
+ <input type="password" name="password" value="" class="inputBox2"/><!--narrow input field-->
+ </div>
+
+ <div class="line"></div>
+
+ <div class="post-form-row">
+ <label>Or Login using Open ID</label>
+ <input type="text" name="openID" value="" class="inputBox2"/><!--narrow input field-->
+ </div>
+
+ </div>
+ <div class="login-btn">
+ <input type="image" src="images/btn-signon.gif" />
+ </div>
+ </form>
+ </div>
+ <div class="bot-login"></div>
+ </div><!--login-box-->
+
+ <div class="box-right">
+ <!--<div class="headingl"></div>
+ <h3>Heading Section A</h3>
+ <div class="headingr"></div>-->
+ <h3><a href="">Heading Section A</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+ <div class="box-right">
+ <h3><a href="">Heading Section B</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+ <div class="box-right">
+ <h3><a href="">Heading Section C</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Added: incubator/esme/branches/new-ui/src/main/webapp/inside.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/inside.html?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/inside.html (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/inside.html Tue Dec 1 15:15:14 2009
@@ -0,0 +1,211 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="back">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu">
+ <ul>
+ <li><a href="/">Public Timeline</a> | </li>
+ <li><a href="">Settings</a> | </li>
+ </ul>
+ <a href="/"><img src="images/btn-signout.gif" alt="" /></a>
+ </div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+
+ <div id="back-header">
+
+ <!---UPDATE BOX-->
+ <div class="container-update">
+ <h3>What are you working on?</h3>
+ <form action="" method="post" >
+ <div id="form-update">
+ <div class="post-form-row">
+ <label>Share with</label>
+ <select name="" class="inputBox2">
+ <option>Some text</option>
+ <option>Some text</option>
+ </select>
+ </div>
+ <div class="post-form-row">
+ <textarea class="inputBox2" rows="5" cols="80%"></textarea>
+ <div class="update-btn">
+ <input type="image" src="images/btn-update.gif" />
+ </div>
+ </div>
+
+ </div>
+
+ </form>
+ </div>
+ <!--END UPDATE BOX-->
+ </div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+
+
+
+</div><!--left-->
+<div id="right">
+
+
+
+ <div class="box-right-back">
+ <div class="avatar"><img src="images/avatar2.gif" alt="" /></div>
+ <strong>Welcome</strong>
+ <div class="info4"><a href="">Nickname Here</a></div>
+ <ul class="main-links">
+ <li><a href="">Home</a></li>
+ <li><a href="">Tracking</a></li>
+ <li><a href="">Actions</a></li>
+ <li><a href="">Contacts</a></li>
+ <li><a href="">Pools</a></li>
+ <li><a href="">Streams</a></li>
+ </ul>
+
+ <!--search form-->
+ <form action="" method="post" >
+ <div id="search">
+ <div class="searchBox"><input type="text" class="inputBox" name="search" value=""/></div>
+ <div class="searchButton">
+ <input type="image" src="images/btn-search.gif" style="padding:0;" />
+ </div>
+
+ </div>
+ </form>
+ <!--search form-->
+
+ <h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/inside.html
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc Tue Dec 1 15:15:14 2009
@@ -0,0 +1,187 @@
+<public:component>
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v2.0 Alpha
+// (c) 2004-2008 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+var IEPNGFix = window.IEPNGFix || {};
+IEPNGFix.data = IEPNGFix.data || {};
+
+
+// This must be a path to a blank image, relative to the HTML document(s).
+// In production use I suggest '/images/blank.gif' or similar. That's all!
+IEPNGFix.blankImg = 'images/blank.gif';
+
+
+IEPNGFix.fix = function(elm, src, t) {
+ // Applies an image 'src' to an element 'elm' using the DirectX filter.
+ // If 'src' is null, filter is disabled.
+ // Disables the 'hook' to prevent infinite recursion on setting BG/src.
+ // 't' = type, where background tile = 0, background = 1, IMG SRC = 2.
+
+ var h = this.hook.enabled;
+ this.hook.enabled = 0;
+
+ var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+ src = (src || '').replace(/\(/g, '%28').replace(/\)/g, '%29');
+
+ if (
+ src && !(/IMG|INPUT/.test(elm.nodeName) && (t != 2)) &&
+ elm.currentStyle.width == 'auto' && elm.currentStyle.height == 'auto'
+ ) {
+ elm.style.width = elm.offsetWidth + 'px';
+ elm.style.height = elm.clientHeight + 'px';
+ if (elm.currentStyle.display == 'inline') {
+ elm.style.display = 'inline-block';
+ }
+ }
+
+ if (t == 1) {
+ elm.style.backgroundImage = 'url("' + this.blankImg + '")';
+ }
+ if (t == 2) {
+ elm.src = this.blankImg;
+ }
+
+ if (elm.filters[f]) {
+ elm.filters[f].enabled = src ? true : false;
+ if (src) {
+ elm.filters[f].src = src;
+ }
+ } else if (src) {
+ elm.style.filter = 'progid:' + f + '(src="' + src +
+ '",sizingMethod="' + (t == 2 ? 'scale' : 'crop') + '")';
+ }
+
+ this.hook.enabled = h;
+};
+
+
+IEPNGFix.process = function(elm, init) {
+ // Checks the onpropertychange event (on first 'init' run, a fake event)
+ // and calls the filter-applying-functions.
+
+ if (
+ !/MSIE (5\.5|6)/.test(navigator.userAgent) ||
+ typeof elm.filters == 'unknown'
+ ) {
+ return;
+ }
+ if (!this.data[elm.uniqueID]) {
+ this.data[elm.uniqueID] = {
+ className: ''
+ };
+ }
+ var data = this.data[elm.uniqueID],
+ evt = init ? { propertyName: 'src,backgroundImage' } : event,
+ isSrc = /src/.test(evt.propertyName),
+ isBg = /backgroundImage/.test(evt.propertyName),
+ isPos = /width|height|background(Pos|Rep)/.test(evt.propertyName),
+ isClass = !init && ((elm.className != data.className) &&
+ (elm.className || data.className));
+ if (!(isSrc || isBg || isPos || isClass)) {
+ return;
+ }
+ data.className = elm.className;
+ var blank = this.blankImg.match(/([^\/]+)$/)[1],
+ eS = elm.style,
+ eCS = elm.currentStyle;
+
+ // Required for Whatever:hover - erase set BG if className changes.
+ if (
+ isClass && (eS.backgroundImage.indexOf('url(') == -1 ||
+ eS.backgroundImage.indexOf(blank) > -1)
+ ) {
+ return setTimeout(function() {
+ eS.backgroundImage = '';
+ }, 0);
+ }
+
+ // Foregrounds.
+ if (isSrc && elm.src && { IMG: 1, INPUT: 1 }[elm.nodeName]) {
+ if ((/\.png/i).test(elm.src)) {
+ this.fix(elm, elm.src, 2);
+ } else if (elm.src.indexOf(blank) == -1) {
+ this.fix(elm, '');
+ }
+ }
+
+ // Backgrounds.
+ var bgSrc = eCS.backgroundImage || eS.backgroundImage;
+ if ((bgSrc + elm.src).indexOf(blank) == -1) {
+ var bgPNG = bgSrc.match(/url[("']+(.*\.png[^\)"']*)[\)"']/i);
+ if (bgPNG) {
+ if (this.tileBG && !{ IMG: 1, INPUT: 1 }[elm.nodeName]) {
+ this.tileBG(elm, bgPNG[1]);
+ this.fix(elm, '', 1);
+ } else {
+ if (data.tiles && data.tiles.src) {
+ this.tileBG(elm, '');
+ }
+ this.fix(elm, bgPNG[1], 1);
+ this.childFix(elm);
+ }
+ } else {
+ if (data.tiles && data.tiles.src) {
+ this.tileBG(elm, '');
+ }
+ this.fix(elm, '');
+ }
+ } else if ((isPos || isClass) && data.tiles && data.tiles.src) {
+ this.tileBG(elm, data.tiles.src);
+ }
+
+ if (init) {
+ this.hook.enabled = 1;
+ elm.attachEvent('onpropertychange', this.hook);
+ }
+};
+
+
+IEPNGFix.childFix = function(elm) {
+ // "hasLayout" fix for unclickable children inside PNG backgrounds.
+ var tags = [
+ 'a',
+ 'input',
+ 'select',
+ 'textarea',
+ 'button',
+ 'iframe',
+ 'object'
+ ],
+ t = tags.length,
+ tFix = [];
+ while (t--) {
+ var pFix = elm.all.tags(tags[t]),
+ e = pFix.length;
+ while (e--) {
+ tFix.push(pFix[e]);
+ }
+ }
+ t = tFix.length;
+ if (t && (/relative|absolute/i).test(elm.currentStyle.position)) {
+ alert('IEPNGFix: Unclickable children of element:' +
+ '\n\n<' + elm.nodeName + (elm.id && ' id=' + elm.id) + '>');
+ }
+ while (t--) {
+ if (!(/relative|absolute/i).test(tFix[t].currentStyle.position)) {
+ tFix[t].style.position = 'relative';
+ }
+ }
+};
+
+
+IEPNGFix.hook = function() {
+ if (IEPNGFix.hook.enabled) {
+ IEPNGFix.process(element, 0);
+ }
+};
+
+
+IEPNGFix.process(element, 1);
+
+</script>
+</public:component>
Propchange: incubator/esme/branches/new-ui/src/main/webapp/src/iepngfix.htc
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/src/style.css
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/src/style.css?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/src/style.css (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/src/style.css Tue Dec 1 15:15:14 2009
@@ -0,0 +1,475 @@
+/* reset - don't modify */
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+fieldset,img{border:0;}
+img{border:0;}
+address,caption,cite,code,dfn,em,th,var{font-style:normal;font-weight:normal;}
+
+em, i {font-style: italic;}
+caption,th {text-align:left;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;}
+/* reset */
+/* BASIC STRUCTURE
+*******************************************************************************/
+
+body { margin: 0; padding: 0; color:#000; line-height:18px; font-size:75%; font-family: Tahoma, Arial, Verdana, Helvetica; }
+body#home { background:#fff url(../images/bg-home.jpg) repeat-x;}
+body#back { background:#fff url(../images/bg-back.jpg) repeat-x;}
+
+#container-bg { margin: 0 auto; width: 890px; }
+#container { width: 890px; float:left; }
+
+/* LINKS - DEFAULT COLORS ARE SET IN BASE.CSS, CHANGE THESE COLORS AS NEEDED.
+*******************************************************************************/
+a:link, a:visited { color: #114e93; text-decoration:none; font-weight:bold; }
+a:hover { color: #88abd2; text-decoration:underline; }
+
+/* HEADER
+*******************************************************************************/
+#header { margin: 0px auto; padding: 0px; height: 72px; width: 871px; }
+
+div#logo {
+ float:left;
+ margin-top:10px;
+ height: 43px;
+ background: url(../images/esme-logo.gif) top left no-repeat;
+}
+
+div#logo h1 {
+ padding-left: 30px;
+ text-indent: -9999px;
+ float:left;
+ display: inline;
+}
+
+div#logo h1 a{
+ display: block;
+ height: 43px;
+ width: 152px;
+
+}
+
+#top-menu {
+ float:right;
+ text-align:right;
+ width:275px;
+ margin-top:15px;
+}
+#top-menu ul {
+ list-style:none;
+ float:left;
+}
+#top-menu li {
+ float:left;
+ margin:5px;
+ color:#2788e1;
+}
+#top-menu a {
+ color:#2788e1;
+}
+
+#left, #right {
+ position:relative;
+}
+#home #left {
+ float:left;
+ width:563px;
+ margin:0 10px;
+ }
+ * html #home #left {
+ float:left;
+ width:533px;
+ margin:0 20px 0 10px;
+ }
+#home #right {
+ float:left;
+ width:283px;
+ margin:0px;
+ }
+
+#back #left {
+ float:left;
+ width:623px;
+ margin:0 10px;
+ }
+#back #right {
+ float:left;
+ width:231px;
+ margin:-11px 0px;
+ }
+
+
+/*BLUE HEADER - HOME
+*********************************************************************************/
+#container-2nd-level-bg {
+ float:left;
+ width: 543px;
+ height:254px;
+ background: url(../images/bg-main-header.jpg) no-repeat;
+ margin-bottom:20px;
+ }
+#container-2nd-level {
+ margin: 0 auto;
+ padding:15px;
+ color:#fff;
+ }
+
+#container-2nd-level h1 {
+ color:#fff;
+ }
+
+/*LOGIN
+********************************************************************************/
+#login-box {
+ width:260px;
+ margin-top:10px;
+}
+.top-login {
+ background: url(../images/login-top.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+.mid-login {
+ background: url(../images/login-bg.gif) no-repeat;
+ padding:10px 15px;
+ width:230px;
+ height:218px;
+}
+.bot-login {
+ background: url(../images/login-bot.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+* html .bot-login {
+ background: url(../images/login-bot.gif) no-repeat;
+ width:260px;
+ height:22px;
+ position:relative;
+ top:-13px;
+}
+.inputBox2 {
+ background-color:#FFFFFF !important;
+ border:1px solid #ccc;
+ width:200px;
+ padding:5px 5px 5px 25px;
+}
+
+label {
+ display:block;
+ font-weight:bold;
+ color:#fff;
+ margin-bottom:5px;
+ padding-right:5px;
+ float:left;
+}
+
+.post-form-row {
+ margin:7px 0;
+}
+.line {
+ margin-top:12px;
+ border-bottom:1px solid #cae5fd;
+}
+.login-btn, update-btn {
+ float:right;
+}
+.update-btn {
+ margin-top:20px;
+ padding-top:10px;
+}
+#form-update label {
+ font-weight:bold;
+ color:#000;
+ margin-top: 5px;
+ padding-right:5px;
+ float:left;
+}
+select.inputBox2 {
+ background-color:#FFFFFF !important;
+ border:1px solid #a7aaad;
+ width:160px;
+ height:30px;
+ padding:4px;
+}
+
+textarea.inputBox2 {
+ float:left;
+ background-color:#FFFFFF !important;
+ border:1px solid #a7aaad;
+ width:440px;
+ height:50px;
+ padding:4px;
+ margin-right:10px;color:#000;
+}
+/*SEARCH
+*********************************************************************************/
+#search {
+ float:left;
+ background:#fff;
+ border:1px solid #ccc;
+ height:28px;
+ width:181px;
+ margin:15px 0 20px 0;
+ }
+.searchBox .inputBox {
+ padding:5px 0 0 8px;
+ float:left;
+ width:140px;
+ border:0;
+ }
+.searchButton {
+ float:left;
+
+ }
+
+/*RIGHT box
+*********************************************************************/
+ul.main-links {
+ list-style:none;
+ margin:20px 0 10px 15px;
+ padding:0;
+}
+.main-links li {
+ padding:3px 0;
+}
+
+.box-right {
+ float:left;
+ background: #f2f5f6 url(../images/bg-box-right.gif) repeat-x;
+ width:230px;
+ padding:10px 15px;
+ margin-top:10px;
+ border:1px solid #f1eded;
+ font-size:90%;
+}
+.box-right h3 {
+ float:left;
+ background: url(../images/heading1.gif) no-repeat;
+ color:#fff;
+ height:29px;
+ width:215px;
+ padding:10px 0 0 20px;
+ margin-left:-25px;
+ font-size:160%;
+}
+
+
+.box-right h3 a{
+ display: block;
+ height:29px;
+ width:215px;
+ color:#fff;
+}
+.box-right h3 a:hover, .box-right-back h3 a:hover {
+ color:#c4ddf4;
+ text-decoration:none;
+}
+* html .box-right h3 {
+ position: relative;
+ left: 0px;
+ margin-left:-15px;
+
+}
+.box-right-back {
+ float:left;
+ background: #ebeef2 url(../images/bg-right-back.jpg) no-repeat;
+ width:196px;
+ padding:10px 10px;
+ margin-top:10px;
+}
+
+.box-right-back h3 {
+ float:left;
+ background: url(../images/heading.gif) no-repeat;
+ color:#fff;
+ height:29px;
+ width:195px;
+ padding:10px 0 0 20px;
+ margin:10px 0 10px -20px;
+ font-size:140%;
+}
+* html .box-right-back h3 {
+ width:155px;
+ padding:10px 0 0 10px;
+ margin:10px 0 10px -25px;
+ font-size:140%;
+}
+.box-right-back h3 a{
+ display: block;
+ height:29px;
+ width:215px;
+ color:#fff;
+}
+* html .box-right-back h3 {
+ position: relative;
+ left: 0px;
+ margin-left:-10px;
+}
+.right-content {
+ float:left;
+ font-size:90%;
+
+}
+
+
+/* CONTENT AREA
+*******************************************************************************/
+#content { margin:0 auto; display:block; width: 851px; padding:20px 10px 0px 10px; }
+
+/* UPDATES
+*******************************************************************************/
+#back-header {
+ margin-top:20px;
+ }
+.container-update {
+
+ width: 563px;
+ height:152px;
+ padding:20px 30px;
+ background: url(../images/bg-update.png) no-repeat;
+ margin-bottom:20px;
+}
+
+.gray-box {
+ float:left;
+ background:#f9f9f9;
+ padding:20px;
+}
+
+.updates-box {
+ float:left;
+ padding:10px 20px;
+}
+.avatar {
+ float:left;
+ width:62px;
+}
+.update {
+ float:left;
+ width:420px;
+ padding:0 10px;
+}
+.update2 {
+ float:left;
+ width:500px;
+ padding:0 10px;
+}
+.tag, .tag a {
+ margin:10px 0 2px;
+ font-weight:normal;
+ }
+.info a {
+ font-weight:bold;
+}
+.info2 a {
+ font-weight:bold;
+ font-size:110%;
+}
+.info3 a {
+ color:#2788e1;
+ font-size:120%;
+ font-weight:bold;
+}
+.tags-box {
+ float:left;
+ margin:10px;
+ width:90%;
+}
+.time {
+ color:#07376d;
+ font-size:80%;
+}
+.style1{
+ font-size:80%;
+}
+.style2 {
+ font-size:100%;
+}
+.style3 {
+ font-size:120%;
+}
+.style4 {
+ font-size:140%;
+}
+.style5 {
+ font-size:160%;
+}
+.actions {
+ float:right;
+}
+.separator {
+ float:left;
+ width:96%;
+ padding:5px;
+ background: url(../images/line.gif) repeat-x;
+}
+.container-tabs {
+ float:left;
+ width: 563px;
+ height:152px;
+ padding:20px 30px;
+ background: url(../images/bg-tabs.png) no-repeat;
+ margin-bottom:20px;
+}
+/* CONTENT TABS*/
+ul#toc {
+ list-style: none;
+ margin-left: 30px;
+ padding: 0;
+}
+
+ul#toc li {
+ background: #f8f9fb url(../images/tab.gif);
+ float: left;
+ margin: 0 2px 0 0;
+ padding-left: 12px;
+}
+
+ul#toc a {
+ background: #f8f9fb url(../images/tab.gif) 100% 0;
+ color: #fff;
+ display: block;
+ float: left;
+ height: 2.2em;
+ line-height: 2.2em;
+ padding: 3px 10px 0 0;
+ text-decoration: none;
+ width:90px;
+ text-align:center;
+ text-transform: uppercase;
+}
+
+ul#toc li.current {
+ background-color: #f8f9fb;
+ background-position: 0 -62px;
+}
+
+ul#toc li.current a {
+ background-position: 100% -62px;
+ color: #fff;
+ font-weight: bold;
+}
+
+
+
+/* FOOTER
+*******************************************************************************/
+#footer {float:left; width:100%; height:61px; margin:0 auto; padding-top:40px; text-align:center; }
+.ftr-links {font-family: Verdana, Arial, Helvetica, sans-serif; line-height: 18px; font-size: 1em; font-weight:bold; color:#333; }
+.ftr-links a, .ftr-links a:visited {color:#0b6ac3; font-size:1em; }
+.ftr-links a:hover {color:#112843; text-decoration:underline;}
+
+/* HEADINGS
+******************************************************************************/
+h1 { font-size: 200%; color:#07376d; font-family: Tahoma, Helvetica, Arial, Verdana; line-height:100%; padding-bottom:4px;margin-bottom:6px;}
+h2 { font-size: 180%; color:#132b45; font-family: Helvetica, Arial, Verdana; }
+h3 { font-size: 160%; color:#132b45; font-family:Arial; margin-bottom:2px; padding-bottom:4px; }
+h4 { font-size: 140%; color:#003300; }
+h5 { font-size: 100%; }
+h6 { font-size: 80%; }
+img, img a {border:0px; }
+
+.clear {clear:both; height:20px; }
+
+.container-update, .container-tabs {behavior: url("src/iepngfix.htc");}
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/src/style.css
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/tabs.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/tabs.html?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/tabs.html (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/tabs.html Tue Dec 1 15:15:14 2009
@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="back">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu">
+ <ul>
+ <li><a href="/">Public Timeline</a> | </li>
+ <li><a href="">Settings</a> | </li>
+ </ul>
+ <a href="/"><img src="images/btn-signout.gif" alt="" /></a>
+ </div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+
+ <div id="back-header">
+ <h1>What's Up?</h1>
+ <div>
+ <ul id="toc">
+ <li class="current"><a href="tabs.html">Page 1</a></li>
+ <li><a href="tabs2.html">Page 2</a></li>
+ <li><a href="tabs3.html">Page 3</a></li>
+ </ul>
+ </div>
+
+ <!---CONTENT BOX-->
+ <div class="container-tabs">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer rhoncus
+ justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar, lacus ut
+ viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui, luctus vel
+ porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget consequat auctor,
+ odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec varius urna.
+ Ut consectetur vulputate lorem et mattis.
+ </p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer
+ rhoncus justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar,
+ lacus ut viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui,
+ luctus vel porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget
+ consequat auctor, odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec
+ varius urna. Ut consectetur vulputate lorem et mattis.
+ </p>
+ </div>
+ <!--END CONTENT BOX-->
+ </div>
+
+
+</div><!--left-->
+<div id="right">
+
+
+
+ <div class="box-right-back">
+ <div class="avatar"><img src="images/avatar2.gif" alt="" /></div>
+ <strong>Welcome</strong>
+ <div class="info4"><a href="">Nickname Here</a></div>
+ <ul class="main-links">
+ <li><a href="">Home</a></li>
+ <li><a href="">Tracking</a></li>
+ <li><a href="">Actions</a></li>
+ <li><a href="">Contacts</a></li>
+ <li><a href="">Pools</a></li>
+ <li><a href="">Streams</a></li>
+ </ul>
+
+ <!--search form-->
+ <form action="" method="post" >
+ <div id="search">
+ <div class="searchBox"><input type="text" class="inputBox" name="search" value=""/></div>
+ <div class="searchButton">
+ <input type="image" src="images/btn-search.gif" style="padding:0;" />
+ </div>
+
+ </div>
+ </form>
+ <!--search form-->
+
+ <h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/tabs.html
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/tabs2.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/tabs2.html?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/tabs2.html (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/tabs2.html Tue Dec 1 15:15:14 2009
@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="back">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu">
+ <ul>
+ <li><a href="/">Public Timeline</a> | </li>
+ <li><a href="">Settings</a> | </li>
+ </ul>
+ <a href="/"><img src="images/btn-signout.gif" alt="" /></a>
+ </div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+
+ <div id="back-header">
+ <h1>What's Up?</h1>
+ <div>
+ <ul id="toc">
+ <li><a href="tabs.html">Page 1</a></li>
+ <li class="current"><a href="tabs2.html">Page 2</a></li>
+ <li><a href="tabs3.html">Page 3</a></li>
+ </ul>
+ </div>
+
+ <!---CONTENT BOX-->
+ <div class="container-tabs">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer rhoncus
+ justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar, lacus ut
+ viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui, luctus vel
+ porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget consequat auctor,
+ odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec varius urna.
+ Ut consectetur vulputate lorem et mattis.
+ </p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer
+ rhoncus justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar,
+ lacus ut viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui,
+ luctus vel porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget
+ consequat auctor, odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec
+ varius urna. Ut consectetur vulputate lorem et mattis.
+ </p>
+ </div>
+ <!--END CONTENT BOX-->
+ </div>
+
+
+</div><!--left-->
+<div id="right">
+
+
+
+ <div class="box-right-back">
+ <div class="avatar"><img src="images/avatar2.gif" alt="" /></div>
+ <strong>Welcome</strong>
+ <div class="info4"><a href="">Nickname Here</a></div>
+ <ul class="main-links">
+ <li><a href="">Home</a></li>
+ <li><a href="">Tracking</a></li>
+ <li><a href="">Actions</a></li>
+ <li><a href="">Contacts</a></li>
+ <li><a href="">Pools</a></li>
+ <li><a href="">Streams</a></li>
+ </ul>
+
+ <!--search form-->
+ <form action="" method="post" >
+ <div id="search">
+ <div class="searchBox"><input type="text" class="inputBox" name="search" value=""/></div>
+ <div class="searchButton">
+ <input type="image" src="images/btn-search.gif" style="padding:0;" />
+ </div>
+
+ </div>
+ </form>
+ <!--search form-->
+
+ <h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/tabs2.html
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/tabs3.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/tabs3.html?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/tabs3.html (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/tabs3.html Tue Dec 1 15:15:14 2009
@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="back">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu">
+ <ul>
+ <li><a href="/">Public Timeline</a> | </li>
+ <li><a href="">Settings</a> | </li>
+ </ul>
+ <a href="/"><img src="images/btn-signout.gif" alt="" /></a>
+ </div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+
+ <div id="back-header">
+ <h1>What's Up?</h1>
+ <div>
+ <ul id="toc">
+ <li><a href="tabs.html">Page 1</a></li>
+ <li><a href="tabs2.html">Page 2</a></li>
+ <li class="current"><a href="tabs3.html">Page 3</a></li>
+ </ul>
+ </div>
+
+ <!---CONTENT BOX-->
+ <div class="container-tabs">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer rhoncus
+ justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar, lacus ut
+ viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui, luctus vel
+ porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget consequat auctor,
+ odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec varius urna.
+ Ut consectetur vulputate lorem et mattis.
+ </p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non felis magna, in lobortis urna. Nullam eget est magna, nec interdum mi. Integer
+ rhoncus justo at tortor sollicitudin elementum. Sed eu mi sed elit facilisis auctor. Fusce adipiscing massa ac ante fermentum gravida. Morbi pulvinar,
+ lacus ut viverra dapibus, diam lorem pharetra libero, vitae imperdiet dolor nulla quis massa. Aenean et lacus nulla, a fermentum purus. Nunc magna dui,
+ luctus vel porttitor at, faucibus nec nibh. Cras eu risus sed purus fringilla venenatis id ac purus. Duis sed arcu lorem. Mauris fringilla, massa eget
+ consequat auctor, odio tortor porta felis, nec consectetur enim dui at leo. Donec dapibus sapien a metus euismod in fermentum justo commodo. Nullam nec
+ varius urna. Ut consectetur vulputate lorem et mattis.
+ </p>
+ </div>
+ <!--END CONTENT BOX-->
+ </div>
+
+
+</div><!--left-->
+<div id="right">
+
+
+
+ <div class="box-right-back">
+ <div class="avatar"><img src="images/avatar2.gif" alt="" /></div>
+ <strong>Welcome</strong>
+ <div class="info4"><a href="">Nickname Here</a></div>
+ <ul class="main-links">
+ <li><a href="">Home</a></li>
+ <li><a href="">Tracking</a></li>
+ <li><a href="">Actions</a></li>
+ <li><a href="">Contacts</a></li>
+ <li><a href="">Pools</a></li>
+ <li><a href="">Streams</a></li>
+ </ul>
+
+ <!--search form-->
+ <form action="" method="post" >
+ <div id="search">
+ <div class="searchBox"><input type="text" class="inputBox" name="search" value=""/></div>
+ <div class="searchButton">
+ <input type="image" src="images/btn-search.gif" style="padding:0;" />
+ </div>
+
+ </div>
+ </form>
+ <!--search form-->
+
+ <h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/tabs3.html
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/branches/new-ui/src/main/webapp/tags.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/new-ui/src/main/webapp/tags.html?rev=885786&view=auto
==============================================================================
--- incubator/esme/branches/new-ui/src/main/webapp/tags.html (added)
+++ incubator/esme/branches/new-ui/src/main/webapp/tags.html Tue Dec 1 15:15:14 2009
@@ -0,0 +1,211 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>ESME</title>
+<meta http-equiv="Content-Language" content="en-US" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta name="keywords" content="ESME" lang="en-US" />
+<meta name="description" content="ESME" lang="en-US" />
+<meta name="copyright" content="ESME" lang="en-US" />
+<meta name="generator" content="" lang="en-US" />
+<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+<meta name="Robots" content="index,follow,noodp" />
+<link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+</head>
+
+<body id="back">
+
+<div id="container-bg">
+<div id="container">
+
+<div id="header">
+ <div id="logo"><h1><a href="/">ESME</a></h1></div>
+ <div id="top-menu">
+ <ul>
+ <li><a href="/">Public Timeline</a> | </li>
+ <li><a href="">Settings</a> | </li>
+ </ul>
+ <a href="/"><img src="images/btn-signout.gif" alt="" /></a>
+ </div>
+</div>
+<!--// ENDS HEADER -->
+
+<div id="left">
+
+ <div id="back-header">
+ <h1>What's Up?</h1>
+ <!---UPDATE BOX-->
+ <div class="container-update">
+ <h3>What are you working on?</h3>
+ <form action="" method="post" >
+ <div id="form-update">
+ <div class="post-form-row">
+ <label>Share with</label>
+ <select name="" class="inputBox2">
+ <option>Some text</option>
+ <option>Some text</option>
+ </select>
+ </div>
+ <div class="post-form-row">
+ <textarea class="inputBox2" rows="5" cols="80%"></textarea>
+ <div class="update-btn">
+ <input type="image" src="images/btn-update.gif" />
+ </div>
+ </div>
+
+ </div>
+
+ </form>
+ </div>
+ <!--END UPDATE BOX-->
+ </div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+ <div class="updates-box">
+
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update2">
+ <div class="info2"><a href="">Nickname</a></div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">in pool default 3 hours ago</div>
+ <div class="actions"><a href="">reply</a> | <a href="">resend</a> | <a href="">conversation</a> </div>
+ </div>
+ </div><!--updates-box-->
+ <div class="separator"></div>
+
+
+
+
+</div><!--left-->
+<div id="right">
+
+
+
+ <div class="box-right-back">
+ <div class="avatar"><img src="images/avatar2.gif" alt="" /></div>
+ <strong>Welcome</strong>
+ <div class="info4"><a href="">Nickname Here</a></div>
+ <ul class="main-links">
+ <li><a href="">Home</a></li>
+ <li><a href="">Tracking</a></li>
+ <li><a href="">Actions</a></li>
+ <li><a href="">Contacts</a></li>
+ <li><a href="">Pools</a></li>
+ <li><a href="">Streams</a></li>
+ </ul>
+
+ <!--search form-->
+ <form action="" method="post" >
+ <div id="search">
+ <div class="searchBox"><input type="text" class="inputBox" name="search" value=""/></div>
+ <div class="searchButton">
+ <input type="image" src="images/btn-search.gif" style="padding:0;" />
+ </div>
+
+ </div>
+ </form>
+ <!--search form-->
+
+ <h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+
+
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+
+
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+
+</div>
+
+
+
+</div><!--// ENDS CONTAINER -->
+</div><!--// ENDS CONTAINER-BG -->
+
+
+
+
+
+<div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
+
+ Copyright © 2009 ESME<br />
+
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/esme/branches/new-ui/src/main/webapp/tags.html
------------------------------------------------------------------------------
svn:executable = *
Author: vdichev
Date: Tue Dec 1 12:51:55 2009
New Revision: 885756
URL: http://svn.apache.org/viewvc?rev=885756&view=rev
Log:
ESME-131 Fix appended tags to HTTP POST action, Twitter API, RSS feed and RestAPI's get_text_msgs
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/external/RssFeed.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
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=885756&r1=885755&r2=885756&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 Tue
Dec 1 12:51:55 2009
@@ -91,7 +91,7 @@
replace("%f", followerName).
replace("%i", user.imageUrl).
replace("%w", user.wholeName).
- replace("%s", msg.getText).
+ replace("%s", msg.body).
replace("%t", msg.getTags).
replace("%d", msg.getWhen.toString)
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=885756&r1=885755&r2=885756&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Tue Dec
1 12:51:55 2009
@@ -284,7 +284,7 @@
case ScalaInterpret => logger.info("Scala interpreter is disabled!")
/*if (msg.source.is != "scala")
- ScalaInterpreter ! ScalaInterpreter.ScalaExcerpt(userId, msg.id.is, msg.pool.is,
msg.getText)
+ ScalaInterpreter ! ScalaInterpreter.ScalaExcerpt(userId, msg.id.is, msg.pool.is,
msg.body)
*/
case PerformFilter => Stats incr "messagesFiltered" // IGNORE
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=885756&r1=885755&r2=885756&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Tue Dec
1 12:51:55 2009
@@ -128,7 +128,7 @@
def msgAttributes(msg: Message) = {
Map("created_at" -> tf.format(new java.util.Date(msg.when.is)),
"id" -> msg.id.is,
- "text" -> msg.getText.trim,
+ "text" -> msg.body.trim,
"source" -> msg.source,
"truncated" -> false,
"favorited" -> false,
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/external/RssFeed.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/external/RssFeed.scala?rev=885756&r1=885755&r2=885756&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/external/RssFeed.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/external/RssFeed.scala Tue
Dec 1 12:51:55 2009
@@ -76,10 +76,10 @@
// a hack to format text identically- difference in urls & trailing whitespace
val lastMessageText =
Message.create.setTextAndTags(message.text, Nil, Empty).
- get.getText.trim
+ get.body.trim
msgs.takeWhile{ msg =>
Message.create.setTextAndTags(msg.text, Nil, Empty).
- get.getText.trim != lastMessageText
+ get.body.trim != lastMessageText
}
case None => msgs
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala?rev=885756&r1=885755&r2=885756&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala Tue Dec
1 12:51:55 2009
@@ -203,7 +203,7 @@
val lastMsg = if (msgList.isEmpty) None
else {
val m = msgList.first
- Some(Distributor.UserCreatedMessage(user, m.getText, m.tags, m.when, Empty,
m.source, Full(m.replyTo), None))
+ Some(Distributor.UserCreatedMessage(user, m.body, m.tags, m.when, Empty,
m.source, Full(m.replyTo), None))
}
val feed = a match {
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885756&r1=885755&r2=885756&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Tue Dec
1 12:51:55 2009
@@ -245,14 +245,7 @@
}
}
- lazy val body: String = {
- val org = originalXml
-
- (org \ "body").map(_.child map {
- case e: Elem => e.text
- case x => x.text
- }).first.first
- }
+ lazy val body: String = originalXml \ "body" text
lazy val metaData: String = {
val org = originalXml
@@ -363,7 +356,7 @@
lazy val toXHTML = transformBody(digestedXHTML)
- lazy val toPlainTextBody = transformBody(Text(getText))
+ lazy val toPlainTextBody = transformBody(Text(body))
private [model] def saveTheTags() = synchronized {
for (tag <- tagIds) {
Author: rhirsch
Date: Tue Dec 1 11:17:25 2009
New Revision: 885736
URL: http://svn.apache.org/viewvc?rev=885736&view=rev
Log:
[ESME-139] Access-related changes should be logged
Just added log if new pool is created
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=885736&r1=885735&r2=885736&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Tue
Dec 1 11:17:25 2009
@@ -44,10 +44,14 @@
import java.util.Date
import java.text.{DateFormat,SimpleDateFormat}
+import java.util.logging._
+
/**
* Manage the sitemap and related snippets for Access Pools
*/
object AccessPoolMgr {
+ val logger: Logger = Logger.getLogger("org.apache.esme.lib.AccessPoolMgr")
+ logger.setLevel(Level.INFO)
def loggedIn_? = User.loggedIn_?
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
@@ -85,6 +89,7 @@
if(privilegeSaved && user.isDefined) {
Distributor ! Distributor.AllowUserInPool(user.get.id.is, p.id.is)
S.notice(S.?("base_pool_msg_new_pool"))
+ logger.info("ACCESS: " + S.?("base_pool_msg_new_pool") + " " + name)
} else
S.error(S.?("base_error_general"))
case _ => S.error(S.?("base_error_general"))
Author: rhirsch
Date: Tue Dec 1 09:38:22 2009
New Revision: 885701
URL: http://svn.apache.org/viewvc?rev=885701&view=rev
Log:
[ESME-40] Static Texts in Resource File
Modified:
incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=885701&r1=885700&r2=885701&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Tue Dec 1 09:38:22
2009
@@ -31,7 +31,7 @@
base_urlstore_err_too_short=The minimum URL length is 3 characters
-base_user_msg_change=User %s changed profile.
+base_user_msg_change=User %s changed profile. Name: %s Image: %s
base_user_msg_login=User %s logged in
base_user_msg_welcome=Welcome %s
base_user_ui_signup=Sign Up
@@ -82,6 +82,9 @@
base_rest_api_err_not_logged_in=User wasn't logged in
base_rest_api_err_missing_param=The '%s' parameter was missing
base_rest_api_err_param_not_found=The %s wasn't found
+base_rest_api_err_param_no_tracking=Couldn't find tracking item
+base_rest_api_err_no_answer=Didn't get an answer
+base_rest_api_err_no_rest_actor=No REST actor
base_conv_menu=Conversations
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=885701&r1=885700&r2=885701&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Tue Dec 1 09:38:22
2009
@@ -177,9 +177,9 @@
future.get(60L * 1000L)
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
- for (act <- restActor.is ?~ "No REST actor";
+ for (act <- restActor.is ?~ S.?("base_rest_api_err_no_rest_actor");
val ignore = act ! ListenFor(future, 0 seconds);
- answer <- waitForAnswer ?~ "Didn't get an answer")
+ answer <- waitForAnswer ?~ S.?("base_rest_api_err_no_answer"))
yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
@@ -358,7 +358,7 @@
for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
id <- trackId ?~ S.?("base_rest_api_err_missing_param", "id");
track <- Tracking.find(By(Tracking.id, id.toLong),
- By(Tracking.user, user)) ?~ "Couldn't find tracking item")
+ By(Tracking.user, user)) ?~ S.?("base_rest_api_err_param_no_tracking"))
yield {
track.removed(true).save
(200,Map(),Empty)
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=885701&r1=885700&r2=885701&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 Tue Dec
1 09:38:22 2009
@@ -186,7 +186,7 @@
for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
id <- S.param("trackid") ?~ S.?("base_rest_api_err_missing_param", "id");
track <- Tracking.find(By(Tracking.id, id.toLong),
- By(Tracking.user, user)) ?~ "Couldn't find tracking item"
+ By(Tracking.user, user)) ?~ S.?("base_rest_api_err_param_no_tracking")
) yield track.removed(true).save
ret
@@ -275,9 +275,9 @@
future.get(6L * 60L * 1000L)
var r: Box[NodeSeq] =
- for (act <- restActor.is ?~ "No REST actor";
+ for (act <- restActor.is ?~ S.?("base_rest_api_err_no_rest_actor");
val ignore = act ! ListenFor(future, 5 minutes);
- answer <- waitForAnswer ?~ "Didn't get an answer")
+ answer <- waitForAnswer ?~ S.?("base_rest_api_err_no_answer"))
yield answer.flatMap{ case (msg, reason) => msg.toXml % reason.attr}
r
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=885701&r1=885700&r2=885701&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Tue Dec
1 09:38:22 2009
@@ -207,7 +207,7 @@
}
def userTimeline(userName: String): Box[TwitterResponse] = {
- User.findFromWeb(userName).map(userTimeline) ?~ "User not found"
+ User.findFromWeb(userName).map(userTimeline) ?~ S.?("base_twitter_api_err_user_not_found")
}
def userTimeline(): Box[TwitterResponse] = {
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=885701&r1=885700&r2=885701&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Tue Dec 1
09:38:22 2009
@@ -60,7 +60,9 @@
Message.create.author(in.id).
when(Helpers.timeNow.getTime).
source("profile").
- setTextAndTags("User " + in.nickname + " changed profile. Name: " + in.wholeName + ",
Image: " + in.imageUrl, Nil, Empty).
+
+ setTextAndTags(S.?("base_user_msg_change", in.nickname, in.wholeName, in.imageUrl), Nil,
Empty).
+ // setTextAndTags("User " + in.nickname + " changed profile. Name: " + in.wholeName +
", Image: " + in.imageUrl, Nil, Empty).
foreach{ msg =>
if (msg.save) {
Distributor ! Distributor.AddMessageToMailbox(in.id, msg, ProfileReason(in.id))
Author: vdichev
Date: Mon Nov 30 15:17:30 2009
New Revision: 885445
URL: http://svn.apache.org/viewvc?rev=885445&view=rev
Log:
ESME-128 Provide API for messages in text or XHTML format
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
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=885445&r1=885444&r2=885445&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 Mon Nov 30
15:17:30 2009
@@ -41,7 +41,7 @@
import model._
import org.apache.esme.actor._
-import scala.xml.{NodeSeq, Text, Elem, XML}
+import scala.xml.{NodeSeq, Text, Elem, Node, XML}
import scala.collection.mutable.ListBuffer
import java.util.logging._
@@ -53,7 +53,12 @@
case Req("api" :: "status" :: Nil, "", GetRequest) => status
case Req("api" :: "login" :: Nil, "", PostRequest) => login
case Req("api" :: "logout" :: Nil, "", GetRequest) => logout
- case Req("api" :: "get_msgs" :: Nil, "", GetRequest) => getMsgs
+ case Req("api" :: "get_msgs" :: Nil, "", GetRequest) =>
+ () => getMsgs(_.toXml)
+ case Req("api" :: "get_xhtml_msgs" :: Nil, "", GetRequest) =>
+ () => getMsgs(_.toXHTML)
+ case Req("api" :: "get_text_msgs" :: Nil, "", GetRequest) =>
+ () => getMsgs(_.toPlainTextBody)
case Req("api" :: "wait_for_msgs" :: Nil, "", GetRequest) =>
waitForMsgs
@@ -313,7 +318,7 @@
r
}
- def getMsgs(): LiftResponse = {
+ def getMsgs(format: Message => Node): LiftResponse = {
val t: Box[NodeSeq] =
for (tagName <- S.param("tag");
tag <- Tag.find(By(Tag.name, tagName)))
@@ -322,7 +327,12 @@
val r: Box[NodeSeq] =
t or (for (user <- calcUser ?~ S.?("base_rest_api_err_param_not_found", "User");
val lst = Mailbox.mostRecentMessagesFor(user.id, 40))
- yield lst.flatMap{ case (msg, why, _) => msg.toXml % why.attr})
+ yield lst.flatMap{ case (msg, why, _) =>
+ format(msg) match {
+ case e: Elem => e % why.attr
+ case x => x
+ }
+ })
r
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885445&r1=885444&r2=885445&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Mon Nov
30 15:17:30 2009
@@ -350,6 +350,20 @@
}
private lazy val originalXml = XML.loadString(text.is)
+
+ def transformBody(ns: NodeSeq) = {
+ import scala.xml.transform.{RuleTransformer, RewriteRule}
+ toXml.map(new RuleTransformer(new RewriteRule{
+ override def transform(n: Node) = n match {
+ case e: Elem if "body" == e.label => <body>{ns}</body>
+ case _ => n
+ }
+ })).first
+ }
+
+ lazy val toXHTML = transformBody(digestedXHTML)
+
+ lazy val toPlainTextBody = transformBody(Text(getText))
private [model] def saveTheTags() = synchronized {
for (tag <- tagIds) {
Author: vdichev
Date: Mon Nov 30 15:14:26 2009
New Revision: 885442
URL: http://svn.apache.org/viewvc?rev=885442&view=rev
Log:
Remove view imports
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=885442&r1=885441&r2=885442&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Mon Nov 30 15:14:26
2009
@@ -37,7 +37,6 @@
import model._
import org.apache.esme.actor._
import lib._
-import view._
import snippet._
import api._
import net.liftweb._
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=885442&r1=885441&r2=885442&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Mon Nov 30
15:14:26 2009
@@ -42,7 +42,6 @@
import org.apache.esme._
import org.apache.esme.actor._
-import org.apache.esme.view._
import java.net.URL
import java.util.logging._
import com.twitter.stats.Stats
Author: vdichev
Date: Mon Nov 30 05:32:02 2009
New Revision: 885333
URL: http://svn.apache.org/viewvc?rev=885333&view=rev
Log:
ESME-134 Deleted UserView
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=885333&r1=885332&r2=885333&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Mon Nov 30 05:32:02
2009
@@ -145,10 +145,6 @@
S.addAround(ExtSession.requestLoans)
- LiftRules.viewDispatch.append {
- case "user_view" :: _ => Right(UserView)
- }
-
// REST APIs (new and old)
LiftRules.dispatch.prepend(RestAPI.dispatch)
LiftRules.dispatch.prepend(API2.dispatch)
Author: vdichev
Date: Mon Nov 30 05:28:24 2009
New Revision: 885332
URL: http://svn.apache.org/viewvc?rev=885332&view=rev
Log:
ESME-134 Deleted unnecessary UserView.
Removed:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/view/UserView.scala
Author: vdichev
Date: Sun Nov 29 23:11:26 2009
New Revision: 885288
URL: http://svn.apache.org/viewvc?rev=885288&view=rev
Log:
ESME-94 Common view for conversation/streams
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=885288&r1=885287&r2=885288&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Sun
Nov 29 23:11:26 2009
@@ -56,19 +56,18 @@
def displayConversation(in: NodeSeq): NodeSeq = {
+ val jsId = "timeline_messages"
+
val cid = S.param("cid").map(toLong).openOr(-1L)
val msgs = Message.findAndPrime(By(Message.conversation, cid),
OrderBy(Message.id, Descending))
- msgs match {
- case Nil => NodeSeq.Empty
- case xs => bind("disp", in,
- "item" ->
- (lst => xs.flatMap(i => bind("item", lst,
- "text" -> i.digestedXHTML,
- ))))
- }
+ Script(
+ OnLoad(JsCrVar(jsId, JsArray(
+ msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) &
+ JsFunc("displayMessages", JsVar(jsId), jsId).cmd)
+ )
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=885288&r1=885287&r2=885288&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala Sun Nov
29 23:11:26 2009
@@ -93,24 +93,15 @@
val query = poolsQuery :::
resentQuery :::
List[QueryParam[Message]](OrderBy(Message.id, Descending), MaxRows(40))
-
- //XXX copy from lib.UserMgr
- def nicknameWithProfileLink(u: User): NodeSeq = {
- <a href={"/user/" + urlEncode(u.nickname.is)}>{u.niceName}</a>
- }
-
- val dateFormatter = new SimpleDateFormat("yyyy/MM/dd hh:mm")
-
- Message.findAll(query: _*) match {
- case Nil => NodeSeq.Empty
- case xs => bind("disp", in,
- "item" ->
- (lst => xs.flatMap(i => bind("item", lst,
- "author" -> i.author.obj.map(nicknameWithProfileLink).openOr(Text("")),
- "text" -> i.digestedXHTML,
- "date" -> dateFormatter.format(i.getWhen)
- ))))
- }
+
+ val jsId = "timeline_messages"
+ val msgs = Message.findAll(query: _*)
+ Script(
+ OnLoad(JsCrVar(jsId, JsArray(
+ msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) &
+ JsFunc("displayMessages", JsVar(jsId), jsId).cmd)
+ )
+
}
def updateSpan(): JsCmd = SetHtml(spanName, doRender())
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html?rev=885288&r1=885287&r2=885288&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html Sun Nov 29 23:11:26
2009
@@ -1,16 +1,12 @@
<lift:surround with="default" at="content">
+ <script src="/scripts/display_messages.js" type="text/javascript"/>
<fieldset>
<legend>
<lift:loc>ui_default_conversation</lift:loc>
</legend>
- <lift:displayConversation>
- <disp:item>
- <ul>
- <li>
- <item:text/>
- </li>
- </ul>
- </disp:item>
- </lift:displayConversation>
+ <div class="b-list">
+ <lift:displayConversation/>
+ <lift:embed what="templates-hidden/timeline"/>
+ </div>
</fieldset>
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=885288&r1=885287&r2=885288&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/streams.html Sun Nov 29 23:11:26
2009
@@ -12,6 +12,7 @@
</script>
<script type="text/javascript" src="../scripts/esme_table_sorter.js">
</script>
+ <script src="/scripts/display_messages.js" type="text/javascript"/>
<div class="demo">
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header
ui-corner-all">
@@ -30,38 +31,10 @@
the main snippet
-->
</lift:ignore>
- <lift:displayStream the_id="StreamSpan">
- <table id="esme-table" class="tablesorter">
- <thead>
- <tr>
- <th>
- <lift:loc>ui_streams_author</lift:loc>
- </th>
- <th>
- <lift:loc>ui_streams_text</lift:loc>
- </th>
- <th>
- <lift:loc>ui_streams_date</lift:loc>
- </th>
- </tr>
- </thead>
- <tbody>
- <disp:item>
- <tr>
- <td>
- <item:author/>
- </td>
- <td>
- <item:text/>
- </td>
- <td>
- <item:date/>
- </td>
- </tr>
- </disp:item>
- </tbody>
- </table>
- </lift:displayStream>
+ <div class="b-list">
+ <lift:displayStream the_id="StreamSpan"/>
+ <lift:embed what="templates-hidden/timeline"/>
+ </div>
</span>
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"
id="tabs-2">
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html?rev=885288&r1=885287&r2=885288&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html Sun Nov 29
23:11:26 2009
@@ -1,4 +1,4 @@
-<table>
+<table id="esme-table" class="tablesorter">
<thead>
<tr>
<th>
Author: vdichev
Date: Sun Nov 29 22:34:26 2009
New Revision: 885282
URL: http://svn.apache.org/viewvc?rev=885282&view=rev
Log:
ESME-101 Html template for search added.
Added:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala (with
props)
incubator/esme/trunk/server/src/main/webapp/info_view/search.html (with props)
incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html (with props)
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=885282&r1=885281&r2=885282&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun Nov 29 22:34:26
2009
@@ -108,7 +108,7 @@
RewriteResponse(List("info_view", "conversation"), Map("cid" -> cid))
case RewriteRequest(ParsePath("search" :: term :: Nil, "", _, _), _, _) =>
- RewriteResponse(List("user_view", "search"), Map("term" -> term))
+ RewriteResponse(List("info_view", "search"), Map("term" -> term))
}
LiftRules.dispatch.append(UrlStore.redirectizer)
@@ -125,7 +125,6 @@
Loc.Snippet("user_info", TagDisplay.userInfo))) ::
Menu(Loc("about", List("static", "about"), S.?("base_menu_about"), Hidden)) ::
Menu(Loc("tag", List("info_view", "tag"), "Tag", Hidden, Loc.Snippet("tag_display",
TagDisplay.display))) ::
- Menu(Loc("search", List("user_view", "search"), S.?("base_menu_search"), Hidden))
::
Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
Snippet("signup", User.signupForm),
Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::
@@ -139,7 +138,8 @@
AuthMgr.menuItems :::
AccessPoolMgr.menuItems :::
StreamMgr.menuItems :::
- ConversationMgr.menuItems
+ ConversationMgr.menuItems :::
+ SearchMgr.menuItems
LiftRules.setSiteMap(SiteMap(entries: _*))
@@ -212,6 +212,7 @@
// Dump information about session every 10 minutes
SessionMaster.sessionWatchers = SessionInfoDumper :: SessionMaster.sessionWatchers
+
}
private def makeUtf8(req: HTTPRequest) = {req.setCharacterEncoding("UTF-8")}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala?rev=885282&r1=885281&r2=885282&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
Sun Nov 29 22:34:26 2009
@@ -61,7 +61,7 @@
scheduled = false
val msgMap = Message.findMessages(messages)
val toDisplay = messages.flatMap(msgMap.get)
- val jsId = "public_timeline_messages";
+ val jsId = "timeline_messages";
OnLoad(JsCrVar(jsId, JsArray(
toDisplay.map(m => JsObj(("message", m.asJs)) ) :_*)) &
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala?rev=885282&r1=885281&r2=885282&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala Sun Nov
29 22:34:26 2009
@@ -64,7 +64,7 @@
for ((id, reason, resent) <- messages;
msg <- msgMap.get(id))
yield (msg, reason, resent)
- val jsId = "timeline_messages";
+ val jsId = "personal_timeline_messages";
OnLoad(JsCrVar(jsId, JsArray(
toDisplay.map{case (msg, reason, resent) =>
Added: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala?rev=885282&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala (added)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala Sun Nov
29 22:34:26 2009
@@ -0,0 +1,80 @@
+/**
+ * Copyright 2008-2009 WorldWide Conferencing, LLC
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.esme.lib
+
+import net.liftweb._
+import http._
+import SHtml._
+import js._
+import JsCmds._
+import JE._
+
+import sitemap._
+import Loc._
+
+import mapper._
+
+import util._
+import common._
+import Helpers._
+
+import model._
+
+import scala.xml._
+
+/**
+ * Manage the sitemap and related snippets for Search
+ */
+object SearchMgr {
+ def loggedIn_? = User.loggedIn_?
+
+ val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
+
+ val menuItems =
+ Menu(Loc("search", List("info_view", "search"), S.?("base_menu_search"), ifIsLoggedIn,
+ Loc.Snippet("displaySearch", displaySearch),
+ Loc.Snippet("searchTerm", searchTerm))) ::
+ Nil
+
+ def searchTerm(in: NodeSeq): NodeSeq = {
+ Text(S.param("term").getOrElse("no words specified"))
+ }
+
+ def displaySearch(in: NodeSeq): NodeSeq = {
+
+ val jsId = "timeline_messages";
+
+ {Script(
+ (for (term <- S.param("term");
+ user <- User.currentUser)
+ yield {
+
+ val msgs = Message.search(term, user.following, 50)
+ OnLoad(JsCrVar(jsId, JsArray(
+ msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) &
+ JsFunc("displayMessages", JsVar(jsId), jsId).cmd)
+ }).getOrElse(Noop)
+ )}
+
+ }
+
+}
Propchange: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/esme/trunk/server/src/main/webapp/info_view/search.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/search.html?rev=885282&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/search.html (added)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/search.html Sun Nov 29 22:34:26
2009
@@ -0,0 +1,11 @@
+<lift:surround with="default" at="content">
+ <script src="/scripts/display_messages.js" type="text/javascript"/>
+
+ Search for <lift:searchTerm/>
+ <div class="b-list">
+ <lift:displaySearch/>
+ <lift:embed what="templates-hidden/timeline"/>
+ </div>
+
+</lift:surround>
+
Propchange: incubator/esme/trunk/server/src/main/webapp/info_view/search.html
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=885282&r1=885281&r2=885282&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Sun Nov 29 22:34:26
2009
@@ -68,7 +68,7 @@
</tr>
</thead>
<lift:comet type="Timeline"/>
- <tbody id="timeline_messages">
+ <tbody id="personal_timeline_messages">
<tr id="message">
<td>
<img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
@@ -120,54 +120,8 @@
</dt>
<dd>
<div class="b-list">
- <table>
- <thead>
- <tr>
- <th>
- <lift:loc>ui_messages_message_label_author</lift:loc>
- </th>
- <th>
- <lift:loc>ui_messages_message_label_message</lift:loc>
- </th>
- <th>
- <lift:loc>ui_messages_message_label_tags</lift:loc>
- </th>
- </tr>
- </thead>
- <lift:comet type="PublicTimeline"/>
- <tbody id="public_timeline_messages">
- <tr id="message">
- <td>
- <img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
- <div id="author">
- -
- </div>
- </td>
- <td class="message">
- <div class="outer">
- <div class="inner
clear">
- <p class="text"
id="body">
- -
- </p>
- </div>
- <div class="metainfo">
- <span id="pool">-</span>
- <span id="reason">-</span>
- <span id="when"
class="date">-</span>
- </div>
- </div>
- </td>
- <td id="tags" class="tag">
- <p id="tag">
- <a href="tag/tag1">-</a>
- </p>
- <p id="tag">
- <a href="tag/tag2">-</a>
- </p>
- </td>
- </tr>
- </tbody>
- </table>
+ <lift:comet type="PublicTimeline"/>
+ <lift:embed what="templates-hidden/timeline"/>
</div>
</dd>
</dl>
@@ -304,7 +258,7 @@
</lift:UserSnip.links>
</div>
<div class="bugs">
- <form action="/user_view/search" class="b-primay">
+ <form action="/info_view/search" class="b-primay">
<input style="height: 20px; background: #c9d8ea;"
name="term"/>
<button class="btn" onclick="javascript:form.submit();">
<lift:loc>ui_messages_search</lift:loc>
Added: incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html?rev=885282&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html (added)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html Sun Nov 29
22:34:26 2009
@@ -0,0 +1,48 @@
+<table>
+ <thead>
+ <tr>
+ <th>
+ <lift:loc>ui_messages_message_label_author</lift:loc>
+ </th>
+ <th>
+ <lift:loc>ui_messages_message_label_message</lift:loc>
+ </th>
+ <th>
+ <lift:loc>ui_messages_message_label_tags</lift:loc>
+ </th>
+ </tr>
+ </thead>
+ <tbody id="timeline_messages">
+ <tr id="message">
+ <td>
+ <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+ <div id="author">
+ -
+ </div>
+ </td>
+ <td class="message">
+ <div class="outer">
+ <div class="inner clear">
+ <p class="text" id="body">
+ -
+ </p>
+ </div>
+ <div class="metainfo">
+ <span id="pool">-</span>
+ <span id="reason">-</span>
+ <span id="when" class="date">-</span>
+ </div>
+ </div>
+ </td>
+ <td id="tags" class="tag">
+ <p id="tag">
+ <a href="tag/tag1">-</a>
+ </p>
+ <p id="tag">
+ <a href="tag/tag2">-</a>
+ </p>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
Propchange: incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline.html
------------------------------------------------------------------------------
svn:executable = *
Author: vdichev
Date: Sun Nov 29 21:17:02 2009
New Revision: 885267
URL: http://svn.apache.org/viewvc?rev=885267&view=rev
Log:
ESME-101 Fix indexing of messages
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885267&r1=885266&r2=885267&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sun Nov
29 21:17:02 2009
@@ -102,8 +102,24 @@
idCache.remove(msg.id)
}
+ def indexMessage(msg: Message) {
+ for(session <- compass.map(_.openSession())) yield {
+ var tx:CompassTransaction = null
+
+ try {
+ tx = session.beginTransaction()
+ session.save(msg)
+ tx.commit();
+ } catch {
+ case ce: CompassException =>
+ if (tx != null) tx.rollback();
+ } finally {
+ session.close();
+ }
+ }
+ }
- override def afterCommit = super.afterCommit
+ override def afterCommit = indexMessage _ :: super.afterCommit
private def saveTags(msg: Message) {
msg.saveTheTags()
Author: vdichev
Date: Sun Nov 29 13:30:10 2009
New Revision: 885222
URL: http://svn.apache.org/viewvc?rev=885222&view=rev
Log:
Performance improvements for cached messages in pools.
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885222&r1=885221&r2=885222&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sun Nov
29 13:30:10 2009
@@ -71,11 +71,14 @@
val (r1, left) = il.foldLeft[(Map[Long, Message], List[Long])](
(Map.empty, Nil)) {
case ((map, left), id) =>
- if (idCache.contains(id) && (!user.isDefined ||
- !idCache(id).pool.defined_? ||
- Privilege.findViewablePools(user.get.id.is).
- contains(idCache(id).pool.is))) {
- (map + (id -> idCache(id)), left)
+ if (idCache.contains(id)) {
+ if (!user.isDefined ||
+ !idCache(id).pool.defined_? ||
+ Privilege.findViewablePools(user.get.id.is).
+ contains(idCache(id).pool.is)) {
+ (map + (id -> idCache(id)), left)
+ } else
+ (map, left)
} else (map, id :: left)
}
Author: vdichev
Date: Sat Nov 28 21:33:49 2009
New Revision: 885151
URL: http://svn.apache.org/viewvc?rev=885151&view=rev
Log:
Parser improvements for inline formatting.
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala?rev=885151&r1=885150&r2=885151&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala Sat Nov
28 21:33:49 2009
@@ -228,15 +228,29 @@
case xs => MsgText(xs.mkString(""))
}
- lazy val emph: Parser[Emph] = '_' ~> rep1(not(spaceEOF) ~ not('_') ~ not(hashTag) ~
not(atName) ~> anyChar) <~ '_' ^^ {
- case xs => Emph(xs.mkString)
+ lazy val begOrSpace: Parser[Int] = rep1(' ') ^^ {case lst => lst.length} | beginl ^^^
0
+ lazy val spaceOrEnd: Parser[Int] = EOL ^^^ 0 | rep1(' ') ^^ {case lst => lst.length}
+
+ def peek[T](p: Parser[T]): Parser[T] = Parser { in =>
+ p(in) match {
+ case s @ Success(v, _) => Success(v, in)
+ case e @ Error(msg, _) => Error(msg, in)
+ case f @ Failure(msg, _) => Failure(msg, in)
+ }
+ }
+
+ lazy val beginl = Parser[Unit]{ in =>
+ if(in.pos.column==1) Success((), in) else Failure("", in)
}
- lazy val strong: Parser[Strong] =
- '*' ~> rep1(not(spaceEOF) ~ not('*') ~ not(hashTag) ~ not(atName) ~> anyChar) <~
'*' ^^ {
- case xs => Strong(xs.mkString)
+ def surrounded(sep: String)(constructor: (String) => MsgInfo): Parser[MsgInfo] =
+ begOrSpace ~ accept(sep) ~> rep1(not(spaceEOF) ~ not(accept(sep)) ~ not(hashTag) ~
not(atName) ~> anyChar) <~ accept(sep) ~ peek(spaceOrEnd) ^^ {
+ case xs => constructor(xs.mkString)
}
+ lazy val emph = surrounded("_"){Emph(_)}
+ lazy val strong = surrounded("*"){Strong(_)}
+
lazy val EOF: Parser[Elem] = elem("EOF", isEof _)
def perform(in: String): Box[Performances] = _perform(in) match {
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885151&r1=885150&r2=885151&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sat Nov
28 21:33:49 2009
@@ -316,6 +316,16 @@
<xml:group> <a href={"/u/"+id}>{url}</a> </xml:group>)).
getOrElse(Text("") )
+ case e: Elem if e.label == "em" =>
+ e.attribute("text").map(text =>
+ <em>{text}</em>).
+ getOrElse(e)
+
+ case e: Elem if e.label == "strong" =>
+ e.attribute("text").map(text =>
+ <strong>{text}</strong>).
+ getOrElse(e)
+
case x => x
})
}
@@ -392,6 +402,12 @@
tags.map(x => x.split(" ").mkString("_")) mkString " "
}
+ /**
+ * Parse and format into XML
+ * Note that the text representation of the XML must be readable
+ * for clients that don't support markup formatting
+ * and is recommended to result in the same XML when parsed
+ */
def setTextAndTags(in: String, tags: List[Tag], metaData: Box[Elem]): Box[Message] = {
MsgParser.parseMessage(in).map{
lst =>
@@ -403,8 +419,8 @@
case MsgText(text) => Text(text)
case URL(url) => <url id={url.id.toString}
url={url.url.toString} uniqueId={url.uniqueId.is} >{url.url.toString}</url>
- case Emph(text) => <em>{text}</em>
- case Strong(text) => <strong>{text}</strong>
+ case Emph(text) => <xml:group> <em text={text}>_{text}_</em>
</xml:group>
+ case Strong(text) => <xml:group> <strong text={text}>*{text}*</strong>
</xml:group>
}
}</body>
<tags>{
Author: akpetteroe
Date: Sat Nov 28 19:33:03 2009
New Revision: 885137
URL: http://svn.apache.org/viewvc?rev=885137&view=rev
Log: (empty)
Added:
incubator/esme/branches/new-ui/
- copied from r885136, incubator/esme/branches/server/
Removed:
incubator/esme/branches/server/
Author: akpetteroe
Date: Sat Nov 28 19:24:11 2009
New Revision: 885136
URL: http://svn.apache.org/viewvc?rev=885136&view=rev
Log:
Branch to work on the new web UI
Added:
incubator/esme/branches/server/
- copied from r885135, incubator/esme/trunk/server/
Author: vdichev
Date: Sat Nov 28 15:22:56 2009
New Revision: 885101
URL: http://svn.apache.org/viewvc?rev=885101&view=rev
Log:
Fix bug in findMessages cache.
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885101&r1=885100&r2=885101&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sat Nov
28 15:22:56 2009
@@ -72,6 +72,7 @@
(Map.empty, Nil)) {
case ((map, left), id) =>
if (idCache.contains(id) && (!user.isDefined ||
+ !idCache(id).pool.defined_? ||
Privilege.findViewablePools(user.get.id.is).
contains(idCache(id).pool.is))) {
(map + (id -> idCache(id)), left)
Author: rhirsch
Date: Fri Nov 27 21:24:46 2009
New Revision: 885023
URL: http://svn.apache.org/viewvc?rev=885023&view=rev
Log:
[ESME-133] Delete the scala file "didperform.scala"
Removed:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/DidPerform.scala
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=885023&r1=885022&r2=885023&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Fri Nov 27 21:24:46
2009
@@ -70,14 +70,14 @@
Message, Mailbox, Tag,
Relationship, MessageTag,
AuthToken, UrlStore, Tracking,
- Action, DidPerform, AccessPool,
+ Action, AccessPool,
Privilege, UserAuth, UserCryptoSig)
}
Schemifier.schemify(true, Log.infoF _, User, ExtSession, Message,
Mailbox, Tag,
Relationship, MessageTag, AuthToken,
- UrlStore, Tracking, Action, DidPerform,
+ UrlStore, Tracking, Action,
AccessPool, Privilege, UserAuth, UserCryptoSig)
LiftRules.statelessDispatchTable.append {
Author: rhirsch
Date: Fri Nov 27 21:19:30 2009
New Revision: 885021
URL: http://svn.apache.org/viewvc?rev=885021&view=rev
Log:
[ESME-14] Redesign, rework, write unit tests for, and fully document API
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=885021&r1=885020&r2=885021&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Fri Nov 27 21:19:30
2009
@@ -56,19 +56,17 @@
case Req("api2" :: "users" :: Nil, _, GetRequest) => allUsers
// Add a method to get detail for a specific user
-
-// Document the fact that tag is no longer a parameter here
+
case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest)
if S.param("timeout").isDefined => waitForMsgs
case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest)
if S.param("history").isDefined => allUserMsgs
- case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest) => getNewMsgs
-// Document the new method for getting messages belonging to a particular tag
- case Req("api2" :: "user" :: "messages" :: "tag" :: tag :: Nil, _, GetRequest)
- => () => allUserMsgs(tag)
-// Possibly deprecate and move to api2/messages or api2/pools/poolName/messages
+ case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest) => getNewMsgs
case Req("api2" :: "user" :: "messages" :: Nil, _, PostRequest) => () => addMsg
+ case Req("api2" :: "user" :: "tags" :: tag :: "messages" :: Nil, _, GetRequest)
+ => () => allUserMsgs(tag)
+
case Req("api2" :: "user" :: "followees" :: Nil, _, GetRequest) => allFollowees
case Req("api2" :: "user" :: "followees" :: Nil, _, PostRequest) => addFollowee
case Req("api2" :: "user" :: "followees" :: userId :: Nil, _, DeleteRequest)
@@ -108,53 +106,66 @@
}
def allSessions(): LiftResponse = {
- val r: Box[Elem] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
- yield {
- <session>{userToXml(user)}</session>
- }
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser)
+ yield {
+ (200,Map(),Full(<session>{userToXml(user)}</session>))
+ }
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((404,Map(),Empty))
+
r
}
def addSession(): LiftResponse = {
- val r: Box[Elem] = if (User.loggedIn_?) Empty else
- for{ token <- S.param("token")
- auth <- AuthToken.find(By(AuthToken.uniqueId, token))
- user <- auth.user.obj
- session <- S.session
- } yield {
- User.logUserIn(user)
- val myActor = buildActor(user.id)
- restActor(Full(myActor))
- <session>{userToXml(user)}</session>
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] = if (User.loggedIn_?) Empty else
+ for(token <- S.param("token")) yield {
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] = for {
+ auth <- AuthToken.find(By(AuthToken.uniqueId, token))
+ user <- auth.user.obj
+ val user_xml: Elem = <session>{userToXml(user)}</session>
+ } yield {
+ User.logUserIn(user)
+ val myActor = buildActor(user.id)
+ restActor(Full(myActor))
+ (200,Map(),Full(user_xml))
+ }
+
+ ret openOr (403,Map(),Empty)
}
r
}
def removeSession(): LiftResponse = {
- if (true) {
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if (User.loggedIn_?) {
User.logUserOut()
- true
- } else false
+ Full((200,Map(),Empty))
+ } else Full((404,Map(),Empty))
+
+ r
}
def allUsers(): LiftResponse = {
val users: NodeSeq = for (user <- User.findAll) yield userToXml(user)
- val r: Elem = <users>{users}</users>
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ Full(if (User.loggedIn_?) (200,Map(),Full(<users>{users}</users>)) else
(403,Map(),Empty))
+
r
}
def allUserMsgs(): LiftResponse = {
- val r: Box[Elem] =
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
for (user <- calcUser ?~ S.?("base_rest_api_err_param_not_found", "User");
val num = S.param("history").map(_.toInt) openOr 40;
val lst = Mailbox.mostRecentMessagesFor(user.id, num))
- yield {
- <messages>{lst.flatMap{ case (msg, _, _) => msgToXml(msg)}}</messages>
- }
+ yield (200,Map(),Full(<messages>{lst.flatMap{ case (msg, reason, _) => msgToXml(msg)
}}</messages>))
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
r
}
@@ -165,11 +176,14 @@
def waitForAnswer: Box[List[(Message, MailboxReason)]] =
future.get(60L * 1000L)
- val r: Box[NodeSeq] =
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
for (act <- restActor.is ?~ "No REST actor";
val ignore = act ! ListenFor(future, 0 seconds);
answer <- waitForAnswer ?~ "Didn't get an answer")
- yield answer.flatMap{ case (msg, reason) => msgToXml(msg) }
+ yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
r
}
@@ -180,225 +194,321 @@
def waitForAnswer: Box[List[(Message, MailboxReason)]] =
future.get(6L * 60L * 1000L)
- var r: Box[NodeSeq] =
- for (act <- restActor.is ?~ "No REST actor";
- length <- S.param("timeout").map(_.toInt * 1000);
- val ignore = act ! ListenFor(future, TimeSpan(length));
- answer <- waitForAnswer ?~ "Didn't get an answer")
- yield answer.flatMap{ case (msg, reason) => msgToXml(msg) }
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (act <- restActor.is ?~ "No REST actor";
+ length <- S.param("timeout").map(_.toInt * 1000);
+ val ignore = act ! ListenFor(future, TimeSpan(length));
+ answer <- waitForAnswer ?~ "Didn't get an answer")
+ yield (200,Map(),Full(<messages>{answer.flatMap{ case (msg, reason) => msgToXml(msg)
}}</messages>))
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
r
}
def allUserMsgs(tag: String): LiftResponse = {
- val r: Box[Elem] =
- for (tagName <- Box(List(tag));
- tag <- Tag.find(By(Tag.name, tagName)))
- yield {
- <tag>
- <name>{tag.name}</name>
- <messages>{tag.findMessages.map(msgToXml(_))}</messages>
- </tag>
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ tagName <- Box(List(tag));
+ tag <- Tag.find(By(Tag.name, tagName)))
+ yield {
+ val tag_xml = <tag><name>{tag.name}</name><messages>{tag.findMessages.map(msgToXml(_))}</messages></tag>
+ (200,Map(),Full(tag_xml))
}
- r
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def addMsg(): LiftResponse = {
// Should return the created message
- val r: Box[Boolean] =
- for (user <- calcUser.map(_.id.is) ?~ S.?("base_rest_api_err_param_not_found", "User");
- msg <- S.param("message") ?~ S.?("base_rest_api_err_missing_param", "message"))
- yield {
- val from: String = S.param("via") openOr "api"
- val pool = for (poolName <- S.param("pool");
- p <- AccessPool.findPool(poolName,
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- calcUser.map(_.id.is) ?~ S.?("base_rest_api_err_param_not_found", "User");
+ msg <- S.param("message") ?~ S.?("base_rest_api_err_missing_param", "message"))
+ yield {
+ val from: String = S.param("via") openOr "api"
+ val pool = for (poolName <- S.param("pool");
+ p <- AccessPool.findPool(poolName,
S.param("realm") openOr AccessPool.Native)
- ) yield p.id.is
+ ) yield p.id.is
- val xml: Box[Elem] = S.param("metadata").flatMap(md =>
- tryo(XML.loadString(md)))
+ val xml: Box[Elem] =
+ S.param("metadata").flatMap(md =>
+ tryo(XML.loadString(md)))
+
+ Distributor !
+ Distributor.UserCreatedMessage(user, msg,
+ Tag.split(S.param("tags")
+ openOr ""),
+ millis,
+ xml,
+ from,
+ S.param("replyto").map(toLong),
+ pool)
+ (200,Map(),Empty)
+ }
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
- Distributor !
- Distributor.UserCreatedMessage(user, msg,
- Tag.split(S.param("tags")
- openOr ""),
- millis,
- xml,
- from,
- S.param("replyto").map(toLong),
- pool)
- true
- }
r
}
def allFollowees(): LiftResponse = {
- val followees: NodeSeq = calcUser.map(_.following)
- .map(_.map(userToXml(_)))
- .openOr(<no_followees/>)
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for(user <- User.currentUser)
+ yield {
+ val followees: NodeSeq =
+ calcUser.map(_.following)
+ .map(_.map(userToXml(_)))
+ .openOr(<no_followees/>)
+ (200,Map(),Full(<followees>{followees}</followees>))
+ }
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
- <followees>{followees}</followees>
+ r
}
def addFollowee(): LiftResponse = {
- val r: Box[Node] =
- for (user <- User.currentUser;
- userName <- S.param("userId");
- other <- User.findFromWeb(userName)
- ) yield {
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ userName <- S.param("userId");
+ other <- User.findFromWeb(userName))
+ yield {
user.follow(other)
- userToXml(other)
- }
+ (200,Map(),Full(userToXml(other)))
+ }
- r
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def removeFollow(userName: Box[String])(): LiftResponse = {
- val r: Box[Boolean] =
- for (user <- User.currentUser;
- userName <- userName;
- other <- User.findFromWeb(userName)
- ) yield user.unfollow(other)
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ userName <- userName;
+ other <- User.findFromWeb(userName))
+ yield {
+ user.unfollow(other)
+ (200,Map(),Empty)
+ }
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
r
}
def allFollowers(): LiftResponse = {
- val followers: NodeSeq = calcUser.map(_.followers)
- .map(_.map(userToXml(_)))
- .openOr(<no_followers/>)
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for(user <- User.currentUser)
+ yield {
+ val followees: NodeSeq =
+ calcUser.map(_.following)
+ .map(_.map(userToXml(_)))
+ .openOr(<no_followees/>)
+ (200,Map(),Full(<followees>{followees}</followees>))
+ }
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
- <followers>{followers}</followers>
+ r
}
def allTracking(): LiftResponse = {
- val tracks: Box[NodeSeq] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
- yield Tracking.findAll(By(Tracking.user, user)).flatMap(_.toXml)
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
+ yield {
+ val track_lst = Tracking.findAll(By(Tracking.user, user)).flatMap(_.toXml)
+ (200,Map(),Full(<tracks>{track_lst}</tracks>))
+ }
- <tracks>{tracks}</tracks>
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def addTracking(): LiftResponse = {
- val ret: Box[Boolean] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- toTrack <- (S.param("track") ?~ S.?("base_rest_api_err_missing_param", "track"))
if toTrack.trim.length > 0)
- yield
- Tracking.create.user(user).regex(toTrack).save
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
+ toTrack <- (S.param("track") ?~ S.?("base_rest_api_err_missing_param", "track"))
if toTrack.trim.length > 0)
+ yield
+ (200,Map(),Full(<track>{Tracking.create.user(user).regex(toTrack).save}</track>))
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def removeTracking(trackId: Box[String]): LiftResponse = {
- val ret: Box[Boolean] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- id <- trackId ?~ S.?("base_rest_api_err_missing_param", "id");
- track <- Tracking.find(By(Tracking.id, id.toLong),
- By(Tracking.user, user)) ?~ "Couldn't find tracking item"
- ) yield track.removed(true).save
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
+ id <- trackId ?~ S.?("base_rest_api_err_missing_param", "id");
+ track <- Tracking.find(By(Tracking.id, id.toLong),
+ By(Tracking.user, user)) ?~ "Couldn't find tracking item")
+ yield {
+ track.removed(true).save
+ (200,Map(),Empty)
+ }
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def allActions(): LiftResponse = {
- val ret: Box[NodeSeq] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
- yield user.performing.flatMap(_.toXml)
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
+ yield (200,Map(),Full(<actions>{user.performing.flatMap(_.toXml)}</actions>))
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def addAction(): LiftResponse = {
- val ret: Box[NodeSeq] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- name <- S.param("name") ?~ S.?("base_rest_api_err_missing_param", "name");
- test <- S.param("test") ?~ S.?("base_rest_api_err_missing_param", "test");
- action <- S.param("action") ?~ S.?("base_rest_api_err_missing_param", "action");
- val a = Action.create.user(user).name(name);
- a2 <- a.setTest(test);
- a3 <- a.setAction(action)) yield a3.saveMe.toXml
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
+ name <- S.param("name") ?~ S.?("base_rest_api_err_missing_param", "name");
+ test <- S.param("test") ?~ S.?("base_rest_api_err_missing_param", "test");
+ action <- S.param("action") ?~ S.?("base_rest_api_err_missing_param", "action");
+ val a = Action.create.user(user).name(name);
+ a2 <- a.setTest(test);
+ a3 <- a.setAction(action))
+ yield {
+ (200,Map(),Full(a3.saveMe.toXml))
+ }
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def changeAction(actionId: Box[String]): LiftResponse = {
- val ret: Box[Boolean] =
- for (action <- findAction(actionId);
- enabled <- S.param("enabled").map(toBoolean) ?~ S.?("base_rest_api_err_missing_param",
"enable"))
- yield action.disabled(!enabled).save
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ action <- findAction(actionId);
+ enabled <- S.param("enabled").map(toBoolean) ?~ S.?("base_rest_api_err_missing_param",
"enable"))
+ yield {
+ action.disabled(!enabled).save
+ (200,Map(),Full(action.toXml))
+ }
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def removeAction(actionId: Box[String]): LiftResponse = {
- val ret: Box[Boolean] =
- for (action <- findAction(actionId))
- yield action.removed(true).save
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ action <- findAction(actionId))
+ yield {
+ action.removed(true).save
+ (200,Map(),Empty)
+ }
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def allPools(): LiftResponse = {
- val ret: Box[NodeSeq] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
- yield AccessPool.findAll(In(AccessPool.id, Privilege.pool, By(Privilege.user, user)),
- OrderBy(AccessPool.id, Descending),
- MaxRows(20)).
- flatMap(_.toXml)
- ret
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in"))
+ yield {
+ val pools_lst = AccessPool.findAll(In(AccessPool.id,
+ Privilege.pool,
+ By(Privilege.user, user)),
+ OrderBy(AccessPool.id, Descending),
+ MaxRows(20)).flatMap(_.toXml)
+ (200,Map(),Full(<pools>{pools_lst}</pools>))
+ }
+
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def addPool(): LiftResponse = {
- val r: Box[Boolean] =
- for (user <- User.currentUser;
- pool <- AccessPool.create.realm(AccessPool.Native).setName(S.param("poolName").openOr(""));
- privilegeSaved = Privilege.create.pool(pool.saveMe).user(user).
- permission(Permission.Admin).save
- ) yield {
- if (privilegeSaved) Distributor ! Distributor.AllowUserInPool(user.id.is, pool.id.is)
- privilegeSaved
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser;
+ pool <- AccessPool.create.realm(AccessPool.Native).setName(S.param("poolName").openOr(""));
+ privilegeSaved = Privilege.create.pool(pool.saveMe)
+ .user(user)
+ .permission(Permission.Admin)
+ .save)
+ yield {
+ if (privilegeSaved) Distributor ! Distributor.AllowUserInPool(user.id.is, pool.id.is)
+ (200,Map(),Full(pool.toXml))
}
- r
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def addUserToPool(poolId: Box[String]): LiftResponse = {
- val r: Box[Boolean] =
- for (adminUser <- User.currentUser;
- poolName <- poolId ?~ S.?("base_rest_api_err_missing_param", "pool");
- realm <- (S.param("realm") or Full(AccessPool.Native));
- pool <- AccessPool.findPool(poolName, realm) ?~ S.?("base_rest_api_err_param_not_found",
"Pool");
- userName <- S.param("userId") ?~ S.?("base_rest_api_err_missing_param", "user");
- user <- User.findFromWeb(userName) ?~ S.?("base_rest_api_err_param_not_found",
"User");
- permissionName <- (S.param("permission") or Full("Write"));
- permission <- Box(Permission.valueOf(permissionName)) ?~ S.?("base_rest_api_err_param_not_found",
"Permission")
- ) yield if(Privilege.hasPermission(adminUser.id.is, pool.id.is, Permission.Admin)) {
- val result = try {
- Privilege.create.user(user).pool(pool).permission(permission).save
- } catch {
- case _: Exception => false
- }
- if (result) Distributor ! Distributor.AllowUserInPool(user.id.is, pool.id.is)
- result
- } else false // "User has no permission to administer pool"
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (adminUser <- User.currentUser;
+ poolName <- poolId ?~ S.?("base_rest_api_err_missing_param", "pool");
+ realm <- (S.param("realm") or Full(AccessPool.Native));
+ pool <- AccessPool.findPool(poolName, realm) ?~ S.?("base_rest_api_err_param_not_found",
"Pool");
+ userName <- S.param("userId") ?~ S.?("base_rest_api_err_missing_param", "user");
+ user <- User.findFromWeb(userName) ?~ S.?("base_rest_api_err_param_not_found",
"User");
+ permissionName <- (S.param("permission") or Full("Write"));
+ permission <- Box(Permission.valueOf(permissionName)) ?~ S.?("base_rest_api_err_param_not_found",
"Permission"))
+ yield
+ if(Privilege.hasPermission(adminUser.id.is, pool.id.is, Permission.Admin)) {
+ val result = try {
+ Privilege.create.user(user).pool(pool).permission(permission).save
+ } catch {
+ case _: Exception => false
+ }
+
+ if (result) Distributor ! Distributor.AllowUserInPool(user.id.is, pool.id.is)
+ (200,Map(),Full(userToXml(user)))
+ } else (403,Map(),Empty) // "User has no permission to administer pool"
- r
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
def getConversation(conversationId: Box[String]): LiftResponse = {
- val ret: Box[NodeSeq] =
- for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
- id <- conversationId.map(toLong) ?~ S.?("base_rest_api_err_missing_param", "id")
- ) yield <conversation id={id.toString}>{
+ val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
+ id <- conversationId.map(toLong) ?~ S.?("base_rest_api_err_missing_param",
"id"))
+ yield (200,Map(),Full(<conversation id={id.toString}>{
Message.findAndPrime(By(Message.conversation, id),
OrderBy(Message.id, Ascending)).map(_.toXml)
- }</conversation>
+ }</conversation>))
- ret
+ val r: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
+ if(ret.isDefined) ret else Full((403,Map(),Empty))
+
+ r
}
private def findAction(actionId: Box[String]): Box[Action] =
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala?rev=885021&r1=885020&r2=885021&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala Fri Nov
27 21:19:30 2009
@@ -42,56 +42,31 @@
import scala.xml.{NodeSeq, Text, Elem, UnprefixedAttribute, Null, Node}
trait ApiHelper {
- implicit def boolToResponse(in: Boolean): LiftResponse =
- buildResponse(in, Empty, Text(""))
-
- implicit def canBoolToResponse(in: Box[Boolean]): LiftResponse =
- buildResponse(in openOr false, in match {
- case Failure(msg, _, _) => Full(Text(msg))
- case _ => Empty
- }, Text(""))
-
- implicit def pairToResponse(in: (Boolean, String)): LiftResponse =
- buildResponse(in._1, Full(Text(in._2)), Text(""))
-
- implicit def nodeSeqToResponse(in: NodeSeq): LiftResponse =
- buildResponse(true, Empty, in)
-
- implicit def listElemToResponse(in: Seq[Node]): LiftResponse =
- buildResponse(true, Empty, in)
+ /**
+ * This method converts from Rack/WSGI response format into the correct Lift response
+ */
- implicit def elemToResponse(in: Elem): LiftResponse =
- buildResponseFromElem(true, Empty, in)
-
- implicit def canNodeToResponse(in: Box[NodeSeq]): LiftResponse = in match {
- case Full(n) => buildResponse(true, Empty, n)
- case Failure(msg, _, _) => buildResponse(false, Full(Text(msg)), Text(""))
- case _ => buildResponse(false, Empty, Text(""))
+ implicit def rackResponse(in: Box[Tuple3[Int,Map[String,String],Box[Elem]]]): LiftResponse
= in match {
+ case Full((200,_,xml)) => buildResponse(true, Empty, xml openOr Text(""))
+ case Full((403,_,_)) => ForbiddenResponse()
+ case Full((404,_,_)) => NotFoundResponse()
+ case _ => InternalServerErrorResponse()
}
implicit def putResponseInBox(in: LiftResponse): Box[LiftResponse] = Full(in)
- implicit def takeResponseOutOfBox(in: Box[LiftResponse]): LiftResponse =
- in openOr false
-
/**
* The method that wraps the outer-most tag around the body
- */
+ */
+
def createTag(in: NodeSeq): Elem
/**
* Build the Response based on the body
*/
+
protected def buildResponse(success: Boolean, msg: Box[NodeSeq],
- body: NodeSeq): LiftResponse = {
- if(success) {
- XmlResponse(createTag(body))
- } else {
- XmlResponse(createTag(body)) // Need to return a 401 response here
- }
- }
-
- protected def buildResponseFromElem(success: Boolean, msg: Box[NodeSeq], body: Elem): LiftResponse
= {
- XmlResponse(createTag(body))
- }
+ body: NodeSeq): LiftResponse =
+ XmlResponse(createTag(body))
+
}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=885021&r1=885020&r2=885021&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Fri Nov
27 21:19:30 2009
@@ -47,44 +47,414 @@
object Api2Specs extends Specification with TestKit {
JettyTestServer.start
- val baseUrl = JettyTestServer.urlFor("")
+ val baseUrl = JettyTestServer.urlFor("/api2/")
val theUser = User.createAndPopulate.nickname("api_test").saveMe
val token = {
val toke = AuthToken.create.user(theUser).saveMe
toke.uniqueId.is
- }
+ }
+
+ val post_session = post("session", "token" -> token)
"API2" should {
- "Login with a valid token results in a 200 response and a proper response body" in {
- for{
- session <- post("/api2/session", "token" -> token)
- } {
- (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
- session.code must be equalTo(200)
+ "/session POST" in {
+ "Attempt to log in with a valid token should succeed with a 200 response" in {
+ for{
+ session <- post_session
+ } {
+ (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
+ session.code must be equalTo 200
+ }
+ }
+
+ "Attempt to create session with an invalid token returns 403 response" in {
+ for{
+ session <- post("session", "token" -> "000000")
+ } {
+ session.code must be equalTo 403
+ }
+ }
+ }
+
+ "/session GET" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ session_response <- session.get("session")
+ } {
+ session_response.code must be equalTo 200
+ ( session_response.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
+ }
+ }
+
+ "with no session returns 404 (not found)" in {
+ for(session_res <- get("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
+ }
+
+ "/session DELETE" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ session_del_response <- session.delete("session")
+ //session_response <- session.get("session")
+ } {
+ session_del_response.code must be equalTo 200
+ //session_response.code must be equalTo(404)
+ }
+ }
+
+ "with no session returns 404 (not found)" in {
+ for(session_res <- delete("session")) {
+ session_res.code must be equalTo 404
+ }
+ }
+ }
+
+ "/users GET" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ users <- session.get("users")
+ } {
+ users.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("users")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/messages GET" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ mess_res <- session.get("user/messages")
+ } {
+ mess_res.code must be equalTo 200
+ }
}
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/messages")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
- "Attempt to create session with an invalid token returns 400 response" in {
- for{
- session <- post("/api2/session", "token" -> "0000000")
- } {
- session.code must be equalTo(400)
+ "/user/messages?history=10 GET" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ res <- session.get("user/messages?history=10")
+ } {
+ res.code must be equalTo 200
+ }
}
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/messages?history=10")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
- "/users" in {
- "Valid session" in {
- "have a response code of 200" in {
- for {
- session <- post("/api2/session", "token" -> token)
- users <- session.get("/api2/users")
- } {
- users.code must be equalTo(200)
- }
+ "/user/messages?timeout=2 GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("user/messages?timeout=2")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/messages?timeout=2")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/messages POST" in {
+ "with valid session" in {
+ for {
+ session <- post_session
+ mess_res <- session.post("user/messages","message"->"test message")
+ } {
+ mess_res.code must be equalTo 200
}
- }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- post("user/messages","message"->"test message")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/followees GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("user/followees")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/followees")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/followees POST" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.post("user/followees", "userId" -> "1")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- post("user/followees", "userId" -> "1")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/followers GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("user/followers")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/followers")) {
+ session_res.code must be equalTo 403
+ }
+ }
}
- }
-}
-
\ No newline at end of file
+
+ "/user/tracks GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("user/tracks")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- get("user/tracks")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/tracks POST" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.post("user/tracks","track" -> ".*")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(session_res <- post("user/tracks","track" -> ".*")) {
+ session_res.code must be equalTo 403
+ }
+ }
+ }
+
+/*
+ * "/user/tracks/TRACKID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * create_track <- sess.post("user/tracks","track"->".*")
+ * res <- sess.delete("user/tracks/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(session_res <- delete("user/tracks/1")) {
+ * session_res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+ "/user/actions GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("user/actions")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- get("user/actions")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/user/actions POST" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.post("user/actions",
+ "name"->"Test action",
+ "test"->"every 5 mins",
+ "action"->"rss:http://blog.com/feed.rss")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- post("user/actions",
+ "name"->"Test action",
+ "test"->"every 5 mins",
+ "action"->"rss:http://blog.com/feed.rss")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+/*
+ * "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1","enabled"->0)
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- post("user/actions/1","enabled"->0)) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+/*
+ * "/user/actions/ACTIONID DELETE" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.delete("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- delete("user/actions/1")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * }
+ */
+
+ "conversations/CONVERSATIONID GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("conversations/1")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- get("conversations/1")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/pools GET" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.get("pools")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- get("pools")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/pools POST" in {
+ "with valid session" in {
+ for {
+ sess <- post_session
+ res <- sess.post("pools","poolName"->"test_pool")
+ } {
+ res.code must be equalTo 200
+ }
+ }
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- post("pools","poolName"->"test_pool")) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+
+ "/pools/POOLID/users POST" in {
+
+/*
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.post("pools/1/users",{"realm"->"test_realm";
+ * "userId"->1;
+ * "permission"->"Write"})
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ */
+
+ "with no session returns 403 (forbidden)" in {
+ for(res <- post("pools/1/users",{"realm"->"test_realm";
+ "userId"->2;
+ "permission"->"Write"})) {
+ res.code must be equalTo 403
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Author: vdichev
Date: Fri Nov 27 07:22:28 2009
New Revision: 884757
URL: http://svn.apache.org/viewvc?rev=884757&view=rev
Log:
Optimized XML parsing into regular expression
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=884757&r1=884756&r2=884757&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Fri Nov
27 07:22:28 2009
@@ -210,14 +210,8 @@
private[model] object text extends MappedText(this){
- import scala.xml.transform.{RuleTransformer, RewriteRule}
override lazy val asJsExp =
- JE.Str(XML.loadString(is).map(new RuleTransformer(new RewriteRule {
- override def transform(n: Node) = n match {
- case e: Elem if "body" == e.label => <body>{digestedXHTML}</body>
- case _ => n
- }
- })).mkString)
+ JE.Str(is.replaceFirst("(?<=<body>).*(?=</body>)", digestedXHTML.mkString))
}
object when extends MappedLong(this) {
Author: vdichev
Date: Thu Nov 26 22:02:36 2009
New Revision: 884711
URL: http://svn.apache.org/viewvc?rev=884711&view=rev
Log:
Performance optimization.
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=884711&r1=884710&r2=884711&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Thu Nov
26 22:02:36 2009
@@ -211,7 +211,7 @@
private[model] object text extends MappedText(this){
import scala.xml.transform.{RuleTransformer, RewriteRule}
- override def asJsExp =
+ override lazy val asJsExp =
JE.Str(XML.loadString(is).map(new RuleTransformer(new RewriteRule {
override def transform(n: Node) = n match {
case e: Elem if "body" == e.label => <body>{digestedXHTML}</body>
Author: vdichev
Date: Thu Nov 26 13:13:41 2009
New Revision: 884547
URL: http://svn.apache.org/viewvc?rev=884547&view=rev
Log:
Replaced Textile formatter with native parser
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala?rev=884547&r1=884546&r2=884547&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala Thu Nov
26 13:13:41 2009
@@ -55,7 +55,7 @@
}
lazy val begin: Parser[List[MsgInfo]] =
- startSpace ~> rep1(url | atName | hashTag | text) <~ spaceEOF
+ startSpace ~> rep1(url | atName | hashTag | emph | strong | text) <~ spaceEOF
lazy val startSpace = rep(' ')
@@ -222,11 +222,21 @@
lazy val spaceEOF = rep(' ') ~ EOF
- lazy val text: Parser[MsgText] = rep1(not(spaceEOF) ~ not(url) ~ not(atName) ~
- not(hashTag) ~> anyChar) ^^ {
+ lazy val text: Parser[MsgText] =
+ rep1(not(spaceEOF) ~ not(url) ~ not(atName) ~ not(hashTag) ~ not(emph) ~ not(strong)
~>
+ anyChar) ^^ {
case xs => MsgText(xs.mkString(""))
}
+ lazy val emph: Parser[Emph] = '_' ~> rep1(not(spaceEOF) ~ not('_') ~ not(hashTag) ~
not(atName) ~> anyChar) <~ '_' ^^ {
+ case xs => Emph(xs.mkString)
+ }
+
+ lazy val strong: Parser[Strong] =
+ '*' ~> rep1(not(spaceEOF) ~ not('*') ~ not(hashTag) ~ not(atName) ~> anyChar) <~
'*' ^^ {
+ case xs => Strong(xs.mkString)
+ }
+
lazy val EOF: Parser[Elem] = elem("EOF", isEof _)
def perform(in: String): Box[Performances] = _perform(in) match {
@@ -433,6 +443,10 @@
case class AtName(user: User) extends MsgInfo
case class HashTag(tag: Tag) extends MsgInfo
case class URL(url: UrlStore) extends MsgInfo
+case class Emph(text: String) extends MsgInfo
+case class Strong(text: String) extends MsgInfo
case class ResenderName(user: User)
case class PoolName(pool: AccessPool)
+
+
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=884547&r1=884546&r2=884547&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Thu Nov
26 13:13:41 2009
@@ -28,7 +28,6 @@
import http.js._
import Helpers._
import java.util.logging._
-import textile.TextileParser
import scala.xml._
@@ -322,10 +321,6 @@
<xml:group> <a href={"/u/"+id}>{url}</a> </xml:group>)).
getOrElse(Text("") )
- case t: Text => <xml:group> { TextileParser.toHtml(t.toString()).flatMap
{ e =>
- if (e.label == "p") e.child else e
- }} </xml:group>
-
case x => x
})
}
@@ -413,6 +408,8 @@
case MsgText(text) => Text(text)
case URL(url) => <url id={url.id.toString}
url={url.url.toString} uniqueId={url.uniqueId.is} >{url.url.toString}</url>
+ case Emph(text) => <em>{text}</em>
+ case Strong(text) => <strong>{text}</strong>
}
}</body>
<tags>{
Author: vdichev
Date: Thu Nov 26 11:36:47 2009
New Revision: 884532
URL: http://svn.apache.org/viewvc?rev=884532&view=rev
Log:
Remove empty space from message text area
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=884532&r1=884531&r2=884532&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Thu Nov 26 11:36:47
2009
@@ -182,8 +182,7 @@
<label>
<lift:loc>ui_messages_message_label_message_request</lift:loc>
</label>
- <textarea rows="4" cols="20" id="textdude" style="width:
90%">
- </textarea>
+ <textarea rows="4" cols="20" id="textdude" style="width:
90%"/>
</div>
<div class="row clear" style="display: none;" id="reply-to-div">
<lift:loc>ui_messages_message_label_message_reply</lift:loc>
Author: vdichev
Date: Thu Nov 26 11:08:35 2009
New Revision: 884510
URL: http://svn.apache.org/viewvc?rev=884510&view=rev
Log:
Scheduler generates first event immediately upon start
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala?rev=884510&r1=884509&r2=884510&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
Thu Nov 26 11:08:35 2009
@@ -68,6 +68,7 @@
ActorPing.schedule(this, DoItDude, everySeconds * 1000L)
}
+ sendMessage()
setupPing()
protected def messageHandler: PartialFunction[Any, Unit] = {
Author: vdichev
Date: Thu Nov 26 11:03:49 2009
New Revision: 884504
URL: http://svn.apache.org/viewvc?rev=884504&view=rev
Log:
Fixed PopStatsActor expiration
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala?rev=884504&r1=884503&r2=884504&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala Thu
Nov 26 11:03:49 2009
@@ -101,8 +101,9 @@
reply(topList)
case Expire => {
- val (live, expired) = queue.partition(_.when < now)
+ val (live, expired) = queue.partition(_.when > now)
expired.foreach(stats -= _.id)
+ ActorPing.schedule(this, Expire, refreshInterval)
live
}
}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala?rev=884504&r1=884503&r2=884504&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
(original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
Thu Nov 26 11:03:49 2009
@@ -33,19 +33,25 @@
"Popularity Stats" should {
"Update top hits after inrcementing statistics" in {
- PopStatsActor !? (500, PopStatsActor.StartStats(ResendStat, 5000, 5000))
+ PopStatsActor !? (100, PopStatsActor.StartStats(ResendStat, 2000, 1000))
- PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 1))
- val stats1 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ PopStatsActor !? (100, PopStatsActor.IncrStats(ResendStat, 1))
+ val stats1 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 2000)
stats1 must beEqualTo(List(1 -> 1))
- PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 3))
- val stats2 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ PopStatsActor !? (100, PopStatsActor.IncrStats(ResendStat, 3))
+ val stats2 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 2000)
stats2 must beEqualTo(List(3 -> 1, 1 -> 1))
- PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 1))
- val stats3 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ PopStatsActor !? (100, PopStatsActor.IncrStats(ResendStat, 1))
+ val stats3 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 2000)
stats3 must beEqualTo(List(1 -> 2, 3 -> 1))
}
+
+ "Information should expire after timeout" in {
+ Thread.sleep(2000)
+ val stats = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 2000)
+ stats must beEqualTo(Nil)
+ }
}
}
Author: vdichev
Date: Thu Nov 26 09:40:54 2009
New Revision: 884478
URL: http://svn.apache.org/viewvc?rev=884478&view=rev
Log:
Formatting indentation
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala?rev=884478&r1=884477&r2=884478&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
Thu Nov 26 09:40:54 2009
@@ -57,28 +57,28 @@
private class SchedulerActor(messageProcessor: LiftActor,
- user: Long,
- everySeconds: Int,
- reason: MailboxReason) extends LiftActor {
+ user: Long,
+ everySeconds: Int,
+ reason: MailboxReason) extends LiftActor {
private case object DoItDude
private var running = true
private def setupPing() {
if (running)
- ActorPing.schedule(this, DoItDude, everySeconds * 1000L)
+ ActorPing.schedule(this, DoItDude, everySeconds * 1000L)
}
setupPing()
protected def messageHandler: PartialFunction[Any, Unit] = {
case DoItDude =>
- if (running) {
- sendMessage()
- setupPing()
- }
+ if (running) {
+ sendMessage()
+ setupPing()
+ }
case ByeBye =>
- running = false
+ running = false
}
def sendMessage() {
@@ -86,18 +86,18 @@
val dateString = TimeHelpers.toInternetDate(now)
Message.create.author(user).
when(now).
- source("every").
+ source("every").
setTextAndTags("Regularly scheduled action: " + dateString, Nil, Empty).
foreach{ msg =>
// Noisy & can't be rejected
// if (msg.save) {
messageProcessor ! Distributor.AddMessageToMailbox(user, msg, reason)
// }
- }
- Stats incr "schedulerMessagesCreated"
- Stats incr "messagesCreated"
- Stats incr "schedulerMessagesCreated"
- Stats incr "messagesCreated"
+ }
+ Stats incr "schedulerMessagesCreated"
+ Stats incr "messagesCreated"
+ Stats incr "schedulerMessagesCreated"
+ Stats incr "messagesCreated"
}
}
Author: vdichev
Date: Wed Nov 25 23:24:12 2009
New Revision: 884337
URL: http://svn.apache.org/viewvc?rev=884337&view=rev
Log:
Format indentation
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala?rev=884337&r1=884336&r2=884337&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
Wed Nov 25 23:24:12 2009
@@ -40,16 +40,15 @@
}
case StopPullActor(obj) =>
- messagePullActors.get(obj).foreach {
- pull =>
- pull ! ByeBye
+ messagePullActors.get(obj).foreach { pull =>
+ pull ! ByeBye
messagePullActors -= obj
}
case Fetch(obj) =>
- messagePullActors.get(obj).foreach (
- _ ! FetchMessages
- )
+ messagePullActors.get(obj).foreach (
+ _ ! FetchMessages
+ )
}
@@ -65,21 +64,23 @@
case class Fetch(any: Any)
- private class MessagePullActor(messageProcessor: LiftActor,
- private var lastMessage: Option[Msg],
- messageSource: UniqueMessageSource) extends LiftActor {
+ private class MessagePullActor(
+ messageProcessor: LiftActor,
+ private var lastMessage: Option[Msg],
+ messageSource: UniqueMessageSource) extends LiftActor {
+
protected def messageHandler = {
case StartUp =>
-
- case ByeBye =>
-
- case (msgs: List[Msg]) =>
- val lastMessages = messageSource.getLastSortedMessages(msgs, lastMessage)
- for (message <- lastMessages) {
- messageProcessor ! message
- lastMessage = Some(message)
- Stats incr "messagesPulled"
- }
+
+ case ByeBye =>
+
+ case (msgs: List[Msg]) =>
+ val lastMessages = messageSource.getLastSortedMessages(msgs, lastMessage)
+ for (message <- lastMessages) {
+ messageProcessor ! message
+ lastMessage = Some(message)
+ Stats incr "messagesPulled"
+ }
case FetchMessages =>
this ! messageSource()
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala?rev=884337&r1=884336&r2=884337&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala Wed
Nov 25 23:24:12 2009
@@ -38,14 +38,15 @@
protected def now = System.currentTimeMillis
protected def messageHandler = {
case StartStats(what, period, refresh) =>
- if (!actors.contains(what))
+ if (!actors.contains(what)) {
actors(what) = Map()
- val stat = actors(what)
- if(!stat.contains(period)) {
- val statActor = new PopStatsActor(period, refresh)
- stat(period) = statActor
- statActor ! StartUp
- }
+ }
+ val stat = actors(what)
+ if(!stat.contains(period)) {
+ val statActor = new PopStatsActor(period, refresh)
+ stat(period) = statActor
+ statActor ! StartUp
+ }
case StopStats(what, period) => // TODO: not used
case TopStats(what, n, period) =>
Author: vdichev
Date: Wed Nov 25 23:22:57 2009
New Revision: 884336
URL: http://svn.apache.org/viewvc?rev=884336&view=rev
Log:
PopStatsActor test
Added:
incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/
incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
(with props)
Added: incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala?rev=884336&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
(added)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
Wed Nov 25 23:22:57 2009
@@ -0,0 +1,51 @@
+/**
+ * Copyright 2008-2009 WorldWide Conferencing, LLC
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.esme.actor
+
+import org.specs._
+import org.specs.runner._
+import org.specs.matcher._
+import org.apache.esme.actor._
+
+class PopStatsActorSpecsAsTest extends JUnit3(PopStatsActorSpecs)
+object PopStatsActorSpecsRunner extends ConsoleRunner(PopStatsActorSpecs)
+
+object PopStatsActorSpecs extends Specification {
+
+ "Popularity Stats" should {
+ "Update top hits after inrcementing statistics" in {
+ PopStatsActor !? (500, PopStatsActor.StartStats(ResendStat, 5000, 5000))
+
+ PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 1))
+ val stats1 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ stats1 must beEqualTo(List(1 -> 1))
+
+ PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 3))
+ val stats2 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ stats2 must beEqualTo(List(3 -> 1, 1 -> 1))
+
+ PopStatsActor !? (500, PopStatsActor.IncrStats(ResendStat, 1))
+ val stats3 = PopStatsActor !? PopStatsActor.TopStats(ResendStat, 5, 5000)
+ stats3 must beEqualTo(List(1 -> 2, 3 -> 1))
+ }
+ }
+}
Propchange: incubator/esme/trunk/server/src/test/scala/org/apache/esme/actor/PopStatsActorTest.scala
------------------------------------------------------------------------------
svn:executable = *
Author: rhirsch
Date: Mon Nov 23 13:46:35 2009
New Revision: 883340
URL: http://svn.apache.org/viewvc?rev=883340&view=rev
Log:
[ESME-14] Redesign, rework, write unit tests for, and fully document API
Patch from Ethan Jewett applied
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=883340&r1=883339&r2=883340&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Mon Nov 23 13:46:35
2009
@@ -59,9 +59,11 @@
// Document the fact that tag is no longer a parameter here
case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest)
- if S.param("timeout").isDefined => waitForMsgs
- case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest) => allUserMsgs
-// Document the new method for getting messages belonging to a particular tag
+ if S.param("timeout").isDefined => waitForMsgs
+ case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest)
+ if S.param("history").isDefined => allUserMsgs
+ case Req("api2" :: "user" :: "messages" :: Nil, _, GetRequest) => getNewMsgs
+// Document the new method for getting messages belonging to a particular tag
case Req("api2" :: "user" :: "messages" :: "tag" :: tag :: Nil, _, GetRequest)
=> () => allUserMsgs(tag)
// Possibly deprecate and move to api2/messages or api2/pools/poolName/messages
@@ -117,12 +119,11 @@
def addSession(): LiftResponse = {
val r: Box[Elem] = if (User.loggedIn_?) Empty else
- for (token <- S.param("token") ?~ S.?("base_rest_api_err_missing_param", "token");
+ for{ token <- S.param("token")
auth <- AuthToken.find(By(AuthToken.uniqueId, token))
- ?~ "Token not found";
- user <- auth.user.obj;
+ user <- auth.user.obj
session <- S.session
- ) yield {
+ } yield {
User.logUserIn(user)
val myActor = buildActor(user.id)
restActor(Full(myActor))
@@ -149,7 +150,8 @@
def allUserMsgs(): LiftResponse = {
val r: Box[Elem] =
for (user <- calcUser ?~ S.?("base_rest_api_err_param_not_found", "User");
- val lst = Mailbox.mostRecentMessagesFor(user.id, 40))
+ val num = S.param("history").map(_.toInt) openOr 40;
+ val lst = Mailbox.mostRecentMessagesFor(user.id, num))
yield {
<messages>{lst.flatMap{ case (msg, _, _) => msgToXml(msg)}}</messages>
}
@@ -157,6 +159,37 @@
r
}
+ def getNewMsgs(): LiftResponse = {
+ val future = new LAFuture[List[(Message, MailboxReason)]]()
+
+ def waitForAnswer: Box[List[(Message, MailboxReason)]] =
+ future.get(60L * 1000L)
+
+ val r: Box[NodeSeq] =
+ for (act <- restActor.is ?~ "No REST actor";
+ val ignore = act ! ListenFor(future, 0 seconds);
+ answer <- waitForAnswer ?~ "Didn't get an answer")
+ yield answer.flatMap{ case (msg, reason) => msgToXml(msg) }
+
+ r
+ }
+
+ def waitForMsgs(): LiftResponse = {
+ val future = new LAFuture[List[(Message, MailboxReason)]]()
+
+ def waitForAnswer: Box[List[(Message, MailboxReason)]] =
+ future.get(6L * 60L * 1000L)
+
+ var r: Box[NodeSeq] =
+ for (act <- restActor.is ?~ "No REST actor";
+ length <- S.param("timeout").map(_.toInt * 1000);
+ val ignore = act ! ListenFor(future, TimeSpan(length));
+ answer <- waitForAnswer ?~ "Didn't get an answer")
+ yield answer.flatMap{ case (msg, reason) => msgToXml(msg) }
+
+ r
+ }
+
def allUserMsgs(tag: String): LiftResponse = {
val r: Box[Elem] =
for (tagName <- Box(List(tag));
@@ -368,21 +401,6 @@
ret
}
- def waitForMsgs(): LiftResponse = {
- val future = new LAFuture[List[(Message, MailboxReason)]]()
-
- def waitForAnswer: Box[List[(Message, MailboxReason)]] =
- future.get(6L * 60L * 1000L)
-
- var r: Box[NodeSeq] =
- for (act <- restActor.is ?~ "No REST actor";
- val ignore = act ! ListenFor(future, 5 minutes);
- answer <- waitForAnswer ?~ "Didn't get an answer")
- yield answer.flatMap{ case (msg, reason) => msgToXml(msg) }
-
- r
- }
-
private def findAction(actionId: Box[String]): Box[Action] =
for (user <- User.currentUser ?~ S.?("base_rest_api_err_not_logged_in");
id <- actionId ?~ S.?("base_rest_api_err_missing_param", "id");
@@ -436,15 +454,15 @@
case ListenFor(who, len) =>
msgs match {
- case Nil =>
- listener.foreach(_.satisfy(Nil))
- listener = Full(who)
- ActorPing.schedule(this, ReleaseListener, len)
+ case Nil =>
+ listener.foreach(_.satisfy(Nil))
+ listener = Full(who)
+ ActorPing.schedule(this, ReleaseListener, len)
- case xs =>
- who.satisfy(xs)
- msgs = Nil
- listener = Empty
+ case xs =>
+ who.satisfy(xs)
+ msgs = Nil
+ listener = Empty
}
}
}
@@ -453,7 +471,7 @@
private case class StartUp(userId: Long)
private case object ByeBye
private case class ListenFor(who: LAFuture[List[(Message, MailboxReason)]],
- howLong: TimeSpan)
+ howLong: TimeSpan)
private case object ReleaseListener
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala?rev=883340&r1=883339&r2=883340&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/ApiHelper.scala Mon Nov
23 13:46:35 2009
@@ -83,9 +83,14 @@
* Build the Response based on the body
*/
protected def buildResponse(success: Boolean, msg: Box[NodeSeq],
- body: NodeSeq): LiftResponse =
- XmlResponse(createTag(body))
-
+ body: NodeSeq): LiftResponse = {
+ if(success) {
+ XmlResponse(createTag(body))
+ } else {
+ XmlResponse(createTag(body)) // Need to return a 401 response here
+ }
+ }
+
protected def buildResponseFromElem(success: Boolean, msg: Box[NodeSeq], body: Elem): LiftResponse
= {
XmlResponse(createTag(body))
}
Modified: incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=883340&r1=883339&r2=883340&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Mon Nov
23 13:46:35 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-package org.apache.esme.api
+package org.apache.esme.api
import org.specs._
import org.specs.runner.JUnit3
import org.specs.runner.ConsoleRunner
import net.liftweb.util._
-import net.liftweb.common._
+import net.liftweb.common._
import org.specs.matcher._
import Helpers._
import net.sourceforge.jwebunit.junit.WebTester
@@ -36,7 +36,7 @@
import org.apache.esme._
import model._
import net.liftweb.http._
-import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
+import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
import net.sourceforge.jwebunit.junit.WebTester
import _root_.junit.framework.AssertionFailedError
@@ -48,31 +48,43 @@
JettyTestServer.start
val baseUrl = JettyTestServer.urlFor("")
-
- implicit val reportError = new ReportFailure {
- def fail(msg: String): Nothing = Api2Specs.this.fail(msg)
- }
- def shouldnt(f: => Unit): Unit =
- try {
- val x = f
- fail("Shouldn't succeed")
- } catch {
- case _ => ()
- }
-
- "allUsers" should {
- "have a response code of 200" in {
- API2.allUsers().toResponse.code must be equalTo(200)
+ val theUser = User.createAndPopulate.nickname("api_test").saveMe
+ val token = {
+ val toke = AuthToken.create.user(theUser).saveMe
+ toke.uniqueId.is
+ }
+
+ "API2" should {
+ "Login with a valid token results in a 200 response and a proper response body" in {
+ for{
+ session <- post("/api2/session", "token" -> token)
+ } {
+ (session.xml \ "session" \ "user" \ "id").text must be equalTo(theUser.id.toString)
+ session.code must be equalTo(200)
+ }
}
- "return a node listing all users" in {
- API2.allUsers().toResponse.toString must include(
-"""<api_response><users><user><id>1</id><nickname>hash</nickname><image>None</image><whole_name>hash</whole_name></user></users></api_response>"""
- )
- }
- }
+ "Attempt to create session with an invalid token returns 400 response" in {
+ for{
+ session <- post("/api2/session", "token" -> "0000000")
+ } {
+ session.code must be equalTo(400)
+ }
+ }
-
+ "/users" in {
+ "Valid session" in {
+ "have a response code of 200" in {
+ for {
+ session <- post("/api2/session", "token" -> token)
+ users <- session.get("/api2/users")
+ } {
+ users.code must be equalTo(200)
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Author: rhirsch
Date: Mon Nov 23 13:45:32 2009
New Revision: 883339
URL: http://svn.apache.org/viewvc?rev=883339&view=rev
Log:
Changed pom.xml to allow for test failures and continue the build
Modified:
incubator/esme/trunk/server/pom.xml
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=883339&r1=883338&r2=883339&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Mon Nov 23 13:45:32 2009
@@ -302,6 +302,13 @@
</buildcommands>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>