r3905 - in trunk: . src/site src/site/rst - Pollen-commits

4 May 2014

Author: tchemit
Date: 2014-05-04 18:40:00 +0200 (Sun, 04 May 2014)
New Revision: 3905

Url: http://forge.chorem.org/projects/pollen/repository/revisions/3905

Log:
begin of site v2

Added:
   trunk/src/site/rst/restApi.rst
Modified:
   trunk/pom.xml
   trunk/src/site/site_en.xml
   trunk/src/site/site_fr.xml

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2014-05-04 00:50:55 UTC (rev 3904)
+++ trunk/pom.xml	2014-05-04 16:40:00 UTC (rev 3905)
@@ -15,7 +15,7 @@
 
   <name>Pollen</name>
   <description>Application de vote Pollen</description>
-  <url>http://maven-site.chorem.org/pollen</url>
+  <url>http://doc.chorem.org/pollen</url>
   <inceptionYear>2009</inceptionYear>
   <licenses>
     <license>
@@ -149,7 +149,7 @@
   <distributionManagement>
     <site>
       <id>doc.${platform}</id>
-      <url>${our.site.repository}/${projectId}</url>
+      <url>${our.site.repository}/${projectId}/v2</url>
     </site>
   </distributionManagement>
 

Added: trunk/src/site/rst/restApi.rst
===================================================================
--- trunk/src/site/rst/restApi.rst	                        (rev 0)
+++ trunk/src/site/rst/restApi.rst	2014-05-04 16:40:00 UTC (rev 3905)
@@ -0,0 +1,111 @@
+~~~~~~~~~~~~~~~
+Pollen Rest API
+~~~~~~~~~~~~~~~
+
+Abstract
+========
+
+- Describe the REST API offers since Pollen 2.0
+
+Doc
+===
+
+GET    /v1/doc                                 
+
+Auth
+====
+
+PUT    /v1/login                               
+GET    /v1/lostpassword/{token}                
+GET    /v1/logout                              
+
+Choice
+======
+
+GET    /v1/polls/{pollId}/choices              
+POST   /v1/polls/{pollId}/choices              
+GET    /v1/polls/{pollId}/choices/{choiceId}   
+PUT    /v1/polls/{pollId}/choices/{choiceId}   
+DELETE /v1/polls/{pollId}/choices/{choiceId}   
+
+Comment
+=======
+
+GET    /v1/polls/{pollId}/comments             
+POST   /v1/polls/{pollId}/comments             
+GET    /v1/polls/{pollId}/comments/{commentId} 
+PUT    /v1/polls/{pollId}/comments/{commentId} 
+DELETE /v1/polls/{pollId}/comments/{commentId} 
+
+FavoriteList
+============
+
+GET    /v1/favoriteLists                       
+GET    /v1/favoriteLists/{flId}                
+POST   /v1/favoriteLists/{flId}/importCsv      
+POST   /v1/favoriteLists/{flId}/importLdap     
+POST   /v1/favoriteLists                       
+PUT    /v1/favoriteLists/{flId}                
+DELETE /v1/favoriteLists/{flId}                
+GET    /v1/favoriteLists/{flId}/members        
+GET    /v1/favoriteLists/{flId}/members/{mId}  
+POST   /v1/favoriteLists/{flId}/members        
+PUT    /v1/favoriteLists/{flId}/members/{mId}  
+DELETE /v1/favoriteLists/{flId}/members/{mId}  
+
+Poll
+====
+
+GET    /v1/polls/new                           
+GET    /v1/polls                               
+GET    /v1/polls/created                       
+GET    /v1/polls/invited                       
+GET    /v1/polls/participated                  
+POST   /v1/polls                               
+GET    /v1/polls/create                        
+PUT    /v1/polls/{pollId}                      
+GET    /v1/polls/{pollId}                      
+DELETE /v1/polls/{pollId}                      
+POST   /v1/polls/{pollId}                      
+GET    /v1/polls/{pollId}/export               
+PUT    /v1/polls/{pollId}/close                
+
+PollenUser
+==========
+
+GET    /v1/users                              
+GET    /v1/users/{userId}                     
+POST   /v1/users                              
+PUT    /v1/users/{userId}                     
+DELETE /v1/users/{userId}                     
+PUT    /v1/users/{userId}?token={}            
+
+VoteCounting
+============
+
+GET    /v1/polls/{pollId}/results             
+
+VoterList
+=========
+
+PUT    /v1/polls/{pollId}/favoriteLists/{flId}
+GET    /v1/polls/{pollId}/voterLists          
+GET    /v1/polls/{pollId}/voterLists/{vlId}   
+POST   /v1/polls/{pollId}/voterLists          
+PUT    /v1/polls/{pollId}/voterLists/{vlId}   
+DELETE /v1/polls/{pollId}/voterLists/{vlId}   
+
+GET    /v1/polls/{pollId}/voterLists/{vlId}/members          
+GET    /v1/polls/{pollId}/voterLists/{vlId}/members/{mId}    
+POST   /v1/polls/{pollId}/voterLists/{vlId}/members          
+PUT    /v1/polls/{pollId}/voterLists/{vlId}/members/{mId}    
+DELETE /v1/polls/{pollId}/voterLists/{vlId}/members/{mId}    
+
+Vote
+====
+
+GET    /v1/polls/{pollId}/votes               
+PUT    /v1/polls/{pollId}/votes               
+GET    /v1/polls/{pollId}/votes/{voteId}      
+PUT    /v1/polls/{pollId}/votes/{voteId}      
+DELETE /v1/polls/{pollId}/votes/{voteId}      

Modified: trunk/src/site/site_en.xml
===================================================================
--- trunk/src/site/site_en.xml	2014-05-04 00:50:55 UTC (rev 3904)
+++ trunk/src/site/site_en.xml	2014-05-04 16:40:00 UTC (rev 3905)
@@ -38,7 +38,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <version>${fluidoSkinVersion}</version>
   </skin>
 
   <custom>
@@ -56,34 +56,36 @@
 
   <poweredBy>
     <logo href="http://maven.apache.org" name="Maven"
-          img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/>
 
     <logo href="http://struts.apache.org/" name="Struts 2"
-          img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/struts2-logo.png"/>
 
     <logo href="http://docutils.sourceforge.net/rst.html"
           name="ReStructuredText"
-          img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/>
 
-    <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
-          img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/>
+    <logo href="http://doc.nuiton.org/jrst" name="JRst"
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/>
 
-    <logo href="http://maven-site.nuiton.org/topia" name="ToPIA"
-          img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/>
+    <logo href="http://doc.nuiton.org/topia" name="ToPIA"
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/topia-logo.png"/>
 
+    <logo href="http://http://www.webmotion-framework.org/" name="WebMotion"/>
+
     <logo href="http://argouml.tigris.org/" name="ArgoUML"
-          img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/argouml-logo.png"/>
   </poweredBy>
 
   <body>
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.chorem.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -109,7 +111,9 @@
 
     <menu name="Public instances">
       <item name="Official instance (Use last stable version of Pollen, No data loss)" href="http://pollen.chorem.org/"/>
-      <item name="Test instance (Use last dev version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen"/>
+      <item name="Test instance (stable) (utilise la dernière version stable, Test purpose only)" href="http://demo.codelutin.com/pollen-stable"/>
+      <item name="Test instance (staging) (utilise la prochaine version stable, Test purpose only)" href="http://demo.codelutin.com/pollen-staging"/>
+      <item name="Test instance (latest) (utilise la dernière version de dev, Test purpose only)" href="http://demo.codelutin.com/pollen-latest"/>
     </menu>
 
     <menu name="Language">
@@ -120,6 +124,7 @@
     <menu name="Technical">
       <item name="Security" href="./security.html"/>
       <item name="UI Tests" href="./tests.html"/>
+      <item name="Rest API" href="./restApi.html"/>
     </menu>
 
     <menu ref="reports"/>
@@ -134,7 +139,9 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_vmFiles=",install.html,"
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2014-05-04 00:50:55 UTC (rev 3904)
+++ trunk/src/site/site_fr.xml	2014-05-04 16:40:00 UTC (rev 3905)
@@ -38,7 +38,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <version>${fluidoSkinVersion}</version>
   </skin>
 
   <custom>
@@ -56,34 +56,36 @@
 
   <poweredBy>
     <logo href="http://maven.apache.org" name="Maven"
-          img="${project.url}/images/logos/maven-feather.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/>
 
     <logo href="http://struts.apache.org/" name="Struts 2"
-          img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos//struts2-logo.png"/>
 
     <logo href="http://docutils.sourceforge.net/rst.html"
           name="ReStructuredText"
-          img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/>
 
-    <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
-          img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/>
+    <logo href="http://doc.nuiton.org/jrst" name="JRst"
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/>
 
-    <logo href="http://maven-site.nuiton.org/topia" name="ToPIA"
-          img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/>
+    <logo href="http://doc.nuiton.org/topia" name="ToPIA"
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/topia-logo.png"/>
 
+    <logo href="http://http://www.webmotion-framework.org/" name="WebMotion"/>
+
     <logo href="http://argouml.tigris.org/" name="ArgoUML"
-          img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/argouml-logo.png"/>
   </poweredBy>
 
   <body>
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -91,8 +93,8 @@
     </breadcrumbs>
 
     <links>
-      <item name="nuiton.org" href="http://www.nuiton.org"/>
-      <item name="chorem.org" href="http://www.chorem.org"/>
+      <item name="Nuiton.org" href="http://forge.nuiton.org"/>
+      <item name="Chorem.org" href="http://forge.chorem.org"/>
       <item name="CodeLutin" href="http://codelutin.com"/>
       <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
     </links>
@@ -107,9 +109,15 @@
       <item name="Configurer Pollen" href="configure.html"/>
     </menu>
 
+    <menu name="Technique">
+      <item name="API REST" href="restApi.html"/>
+    </menu>
+
     <menu name="Instances publiques">
       <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="http://pollen.chorem.org/"/>
-      <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/>
+      <item name="Instance de tests (stable) (utilise la dernière version stable, Données non conversées)" href="http://demo.codelutin.com/pollen-stable"/>
+      <item name="Instance de tests (staging) (utilise la prochaine version stable, Données non conversées)" href="http://demo.codelutin.com/pollen-staging"/>
+      <item name="Instance de tests (latest) (utilise la dernière version de dev, Données non conversées)" href="http://demo.codelutin.com/pollen-latest"/>
     </menu>
 
     <menu name="Langue">
@@ -130,7 +138,9 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_vmFiles=",install.html,"
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>

    

r3905 - in trunk: . src/site src/site/rst

tchemit＠users.chorem.org

tags

participants (1)