You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/09/15 10:26:21 UTC
svn commit: r1171002 - in /esme/branches/lift-2.4: ./ server/
server/src/main/resources/props/ server/src/main/scala/org/apache/esme/api/
server/src/test/scala/org/apache/esme/api/
Author: lester
Date: Thu Sep 15 08:26:21 2011
New Revision: 1171002
URL: http://svn.apache.org/viewvc?rev=1171002&view=rev
Log:
Merged latest changes from trunk.
Modified:
esme/branches/lift-2.4/ (props changed)
esme/branches/lift-2.4/server/ (props changed)
esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml (props changed)
esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/api/API2.scala
esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/API2Test.scala
esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/ApiTest.scala
Propchange: esme/branches/lift-2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 08:26:21 2011
@@ -1,3 +1,3 @@
/esme/branches/lift-2.2/trunk:1051384-1055974
-/esme/trunk:1150805-1167068
+/esme/trunk:1150805-1171000
/incubator/esme/branches/lift-2.2/trunk:1043371-1051383
Propchange: esme/branches/lift-2.4/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 08:26:21 2011
@@ -1,6 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite:1088273-1090390
/esme/branches/lift-2.2/trunk/server:1051384-1055974
-/esme/trunk/server:1150805-1166873
+/esme/trunk/server:1150805-1171000
/incubator/esme/branches/lift-2.0/server:928728-939625
/incubator/esme/branches/lift-2.2/trunk/server:1043371-1051383
/incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view:1043380-1044792
Propchange: esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 08:26:21 2011
@@ -1,6 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite/src/main/resources/props/compass.filesystem.cfg.xml:1088273-1090390
/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1051384-1055974
-/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1167068
+/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1171000
/incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1043371-1051383
/incubator/esme/branches/metadata/src/main/resources/props/compass.filesystem.cfg.xml:966215-979767
/incubator/esme/branches/tagandconversationfollow/src/main/resources/props/compass.filesystem.cfg.xml:966215-1006324
Modified: esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/api/API2.scala?rev=1171002&r1=1171001&r2=1171002&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/api/API2.scala Thu Sep 15 08:26:21 2011
@@ -513,7 +513,7 @@ object API2 extends ApiHelper with XmlHe
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"))
+ val enabled = S.param("enabled").map(toBoolean).openOr(action.enabled))
yield {
action.disabled(!enabled).save
(200,Map(),Full(action.toXml))
Modified: esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=1171002&r1=1171001&r2=1171002&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/API2Test.scala Thu Sep 15 08:26:21 2011
@@ -548,24 +548,31 @@ object Api2Specs extends Specification w
}
}
- /*
- * "/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 enabled parameter" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- put("user/actions/1", "enabled" -> "0")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * } */
// Brittle, brittle, brittle
"/user/actions/ACTIONID DELETE" in {
Modified: esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/ApiTest.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/ApiTest.scala?rev=1171002&r1=1171001&r2=1171002&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/ApiTest.scala (original)
+++ esme/branches/lift-2.4/server/src/test/scala/org/apache/esme/api/ApiTest.scala Thu Sep 15 08:26:21 2011
@@ -202,18 +202,14 @@ object ApiSpecs extends Specification wi
"SendMessageToken" in {
for{
send_msg <- post("/api/send_msg", "token" -> token, "message" -> "mymessage") !@ "Failed to send_msg with token" if (testSuccess(send_msg))
- } {
- println(send_msg.xml)
- }
+ } { }
}
"AddPool" in {
for{
login <- post("/api/login", "token" -> token) !@ "Failed to log in" if (testSuccess(login))
add_pool <- login.post("/api/add_pool/ttt87") !@ "Failed to add a pool" if (testSuccess(add_pool))
- } {
- //println(add_pool.xml)
- }
+ } { }
}
"AddPoolNeg" in {
@@ -236,9 +232,7 @@ object ApiSpecs extends Specification wi
"SendMessageTokenNeg" in {
for{
send_msg1 <- post("/api/send_msg", "token" -> token) !@ "send_msg should have failed with no message" if shouldnt(testSuccess(send_msg1))
- } {
- println(send_msg1.xml)
- }
+ } { }
}
}