esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vdic...@apache.org
Subject svn commit: r783903 - in /incubator/esme/branches/access-pools/server: ./ src/main/scala/bootstrap/liftweb/ src/main/scala/org/apache/esme/api/ src/main/scala/org/apache/esme/model/ src/main/scala/org/apache/esme/snippet/ src/main/webapp/pools_view/ sr...
Date Thu, 11 Jun 2009 21:04:24 GMT
Author: vdichev
Date: Thu Jun 11 21:04:23 2009
New Revision: 783903

URL: http://svn.apache.org/viewvc?rev=783903&view=rev
Log:
ESME-57 Web UI for access pool creation.

Added:
    incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/
    incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html   (with
props)
Modified:
    incubator/esme/branches/access-pools/server/pom.xml
    incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Action.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Tracking.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/User.scala
    incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/snippet/Style.scala
    incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/default.html
    incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/message.html

Modified: incubator/esme/branches/access-pools/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/pom.xml?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/pom.xml (original)
+++ incubator/esme/branches/access-pools/server/pom.xml Thu Jun 11 21:04:23 2009
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.esme</groupId>
   <artifactId>esme-server</artifactId>
-  <version>0.2.3-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>ESME</name>
   <inceptionYear>2008</inceptionYear>
   <properties>
-    <lift.version>1.0</lift.version>
-    <scala.version>2.7.3</scala.version>
+    <lift.version>1.1-SNAPSHOT</lift.version>
+    <scala.version>2.7.4</scala.version>
     <compass.version>2.1.1</compass.version>
     <lucene.version>2.4.0</lucene.version>
     <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
@@ -187,9 +187,9 @@
       <version>${lucene.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.specs</groupId>
+      <groupId>org.scala-tools.testing</groupId>
       <artifactId>specs</artifactId>
-      <version>1.3.1</version>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
Thu Jun 11 21:04:23 2009
@@ -108,6 +108,7 @@
     User.sitemap :::
     Track.menuItems :::
     Auth.menuItems :::
+    AccessPoolMgr.menuItems :::
     ActionView.menuItems
 
     LiftRules.setSiteMap(SiteMap(entries:_*))

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
Thu Jun 11 21:04:23 2009
@@ -37,7 +37,7 @@
 
 import org.apache.esme._
 import model._
-import actor._
+import org.apache.esme.actor._
 
 import scala.xml.{NodeSeq, Text, Elem, XML}
 import scala.actors.Actor

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
Thu Jun 11 21:04:23 2009
@@ -40,7 +40,7 @@
 
 import org.apache.esme._
 import model._
-import actor._
+import org.apache.esme.actor._
 
 import scala.xml._
 import scala.actors.Actor

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Action.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Action.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Action.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Action.scala
Thu Jun 11 21:04:23 2009
@@ -28,7 +28,7 @@
 
 import org.apache.esme._
 import lib._
-import actor._
+import org.apache.esme.actor._
 import external._
 
 import java.util.Calendar

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Tracking.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Tracking.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Tracking.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Tracking.scala
Thu Jun 11 21:04:23 2009
@@ -28,7 +28,7 @@
 import http._
 
 import org.apache.esme._
-import actor.Distributor
+import org.apache.esme.actor.Distributor
 
 import scala.xml.{Node, Text, Elem}
 

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/User.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/User.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/User.scala
Thu Jun 11 21:04:23 2009
@@ -39,7 +39,7 @@
 import scala.xml.{NodeSeq, Text}
 
 import org.apache.esme._
-import actor._
+import org.apache.esme.actor._
 import view._
 import java.net.URL
 import java.util.logging._
@@ -203,7 +203,7 @@
   def createAConsumer = new ESMEOpenIDConsumer
 }
 
-class ESMEOpenIDConsumer extends OpenIDConsumer[User]
+class ESMEOpenIDConsumer extends OpenIdConsumer[User]
 {
   override val manager = {
 

Modified: incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/snippet/Style.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/snippet/Style.scala?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/snippet/Style.scala
(original)
+++ incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/snippet/Style.scala
Thu Jun 11 21:04:23 2009
@@ -31,7 +31,7 @@
 
 import org.apache.esme._
 import model._
-import actor._
+import org.apache.esme.actor._
 
 import scala.xml.{NodeSeq, Unparsed}
 

Added: incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html?rev=783903&view=auto
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html (added)
+++ incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html Thu
Jun 11 21:04:23 2009
@@ -0,0 +1,21 @@
+<lift:surround with="default" at="content">
+
+  Manage access pools: <br/>
+
+  <lift:form>
+    <lift:addPool>
+      Add pool with name: <add:poolName/>
+      <input type="submit" value="Add" />
+    </lift:addPool>
+  </lift:form>
+  
+<!--  <lift:form>
+    <lift:editPool>
+      Edit user permissions within pool: <edit:poolName/> <br/>
+      User name: <edit:username/> <edit:permission/>
+      <input type="submit" value="Edit" />
+    </lift:editPool>
+  </lift:form>-->
+  
+
+</lift:surround>

Propchange: incubator/esme/branches/access-pools/server/src/main/webapp/pools_view/index.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/default.html?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/default.html
(original)
+++ incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/default.html
Thu Jun 11 21:04:23 2009
@@ -24,6 +24,7 @@
           <li><lift:Menu.item name="trackMgt"/></li>
           <li><lift:Menu.item name="actionMgt"/></li>
           <li><lift:Menu.item name="authToken"/></li>
+          <li><lift:Menu.item name="accessPools"/></li>
           <li><lift:Menu.item name="Logout"/></li>
         </ul>
       </div>

Modified: incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/message.html?rev=783903&r1=783902&r2=783903&view=diff
==============================================================================
--- incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/message.html
(original)
+++ incubator/esme/branches/access-pools/server/src/main/webapp/templates-hidden/message.html
Thu Jun 11 21:04:23 2009
@@ -100,6 +100,7 @@
           <li><lift:Menu.item name="trackMgt"/></li>
           <li><lift:Menu.item name="actionMgt"/></li>
           <li><lift:Menu.item name="authToken"/></li>
+          <li><lift:Menu.item name="accessPools"/></li>
           <li><lift:Menu.item name="Logout"/></li>
         </ul>
       </div>



Mime
View raw message