From mfortun@users.nuiton.org Tue Aug 30 12:32:56 2011
From: mfortun@users.nuiton.org
To: wikitty-commits@list.nuiton.org
Subject: [Wikitty-commits] r1203 - in trunk: wikitty-publication/src/site/doc
	wikitty-publication-ui/src/main/webapp
	wikitty-publication-ui/src/main/webapp/WEB-INF/jsp wp-maven-plugin
Date: Tue, 30 Aug 2011 12:32:56 +0200
Message-ID: <20110830103256.91C411589E@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6760543012755334999=="

--===============6760543012755334999==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: mfortun
Date: 2011-08-30 12:32:56 +0200 (Tue, 30 Aug 2011)
New Revision: 1203

Url: http://nuiton.org/repositories/revision/wikitty/1203

Log:
*restore pom
*small change for better navigation between page

Modified:
   trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp
   trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp
   trunk/wikitty-publication-ui/src/main/webapp/index.jsp
   trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.r=
st
   trunk/wp-maven-plugin/pom.xml

Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_public=
ation.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.=
rst	2011-08-30 09:44:53 UTC (rev 1202)
+++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.=
rst	2011-08-30 10:32:56 UTC (rev 1203)
@@ -3,14 +3,63 @@
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 :Authors: Mano=C3=ABl Fortun
=20
+Comment faire ?
+---------------
=20
-Passer par le navigateur
=20
+Depuis un syst=C3=A8me de fichier
+****************************
=20
-Initialiser un repository local avec un pom
+Utiliser le plug in maven
+avec le pom =C3=A9l=C3=A9mentaire
+se r=C3=A9g=C3=A9ffer =C3=A0 la doc sur les outils pour connaitre les goals.
=20
+goal init
+et apr=C3=A8s on code au bon endroit
=20
+exemple parlant
=20
+Directement dans le Navigateur
+******************************
+
+uniquement des wikitty dont les extensions existe d=C3=A9ja
+WikittyPubText pour le code
+WikittyPubData pour image/ tout ce qui est binaire
+
+
+Quoi mettre dans le code ?
+--------------------------
+
+En quoi l'=C3=A9crire
+****************
+
+Langage le bon mime type
+
+
+faire des UI
+
+Bindings
+********
+
+
+
+
+Choses possibles avec les Bindings
+**********************************
+
+
+
+
+
+
+
+D=C3=A9tails de l'exemple
+--------------------
+
+
+
+
+
 Faire des entit=C3=A9s avec wikitty
=20
=20

Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp	2011-08=
-30 09:44:53 UTC (rev 1202)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp	2011-08=
-30 10:32:56 UTC (rev 1203)
@@ -74,6 +74,13 @@
 }</style>
=20
 <h1>Edit <%=3Dwikitty.getId()%></h1>
+<p>
+	<s:set var=3D"localContext"><%=3Daction.getContextArgs()%></s:set>
+	<s:url var=3D"urledit" action=3D"%{#localContext}/view/" />
+	<a href=3D"${urledit}">View</a>
+	<s:url var=3D"urledit" action=3D"%{#localContext}/edit/" />
+	<a href=3D"${urledit}">New Wikitty</a>
+</p>
=20
 <pre><%=3DStringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre>
=20

Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp	2011-08=
-30 09:44:53 UTC (rev 1202)
+++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp	2011-08=
-30 10:32:56 UTC (rev 1203)
@@ -49,8 +49,7 @@
 <sj:head jquerytheme=3D"default"/>
=20
 <%
-
-        PublicationActionView action =3D PublicationActionView
+    PublicationActionView action =3D PublicationActionView
                 .getAction();
=20
         Wikitty wikit =3D action.getWikittyResult();
@@ -59,16 +58,23 @@
 %>
=20
=20
-<h1><%=3Daction.getText("publication.view.title") %></h1>
+<h1><%=3Daction.getText("publication.view.title")%></h1>
=20
=20
 <pre><%=3DStringEscapeUtils.escapeHtml(String
-                            .valueOf(wikit))%></pre>
+                                .valueOf(wikit))%></pre>
 <%
     }
 %>
=20
+<p>
+	<s:set var=3D"localContext"><%=3Daction.getContextArgs()%></s:set><s:url
+			var=3D"urledit" action=3D"%{#localContext}/edit/" />
+		<a href=3D"${urledit}">New wikitty</a>
+</p>
=20
+
+
 <div id=3D"wikittyInfo">
 	<img  src=3D"/img/indicator.gif"
 		alt=3D"Loading..." style=3D"display: none" />
@@ -83,9 +89,9 @@
 	</div>
 	<s:textfield label=3D"First" key=3D"first" name=3D"first" />
 	<s:textfield label=3D"End" key=3D"end" name=3D"end" />
-	<input type=3D"submit" name=3D"search" value=3D"<%=3Daction.getText("public=
ation.view.search") %>" />
+	<input type=3D"submit" name=3D"search" value=3D"<%=3Daction.getText("public=
ation.view.search")%>" />
 =09
-	<pre> <%=3Daction.getText("publication.view.founds") %>: <%=3Daction.getPag=
edResult().getNumFound()%></pre>
+	<pre> <%=3Daction.getText("publication.view.founds")%>: <%=3Daction.getPage=
dResult().getNumFound()%></pre>
 =09
 	<br/> =09
=20
@@ -102,22 +108,16 @@
=20
=20
 		<%
-			int i=3D0;
-		    for (Wikitty w : action.getPagedResult().getAll()) {
+		    int i =3D 0;
+		            for (Wikitty w : action.getPagedResult().getAll()) {
 		%>
 		<tr>
 			<td><s:set var=3D"wid"><%=3Dw.getId()%></s:set> <s:set
 					var=3D"localContext"><%=3Daction.getContextArgs()%></s:set> <s:url
 					var=3D"urledit" action=3D"%{#localContext}/edit/elt_id:%{#wid}" /> <a
 				href=3D"${urledit}">Edit</a> <s:url var=3D"urlraw"
-					action=3D"%{#localContext}/raw/elt_id:%{#wid}" /> <a
-				href=3D"${urlraw}">Raw</a> <s:url var=3D"urleval"
-					action=3D"%{#localContext}/eval/elt_id:%{#wid}" /> <a
-				href=3D"${urleval}">Eval</a>
-				<!-- <a id=3D"ajaxlink_<%=3Di%>" href=3D"javascript:void(0)">View</a> -->
-			=09
-			=09
-				 <s:set
+					action=3D"%{#localContext}/raw/elt_id:%{#wid}" />=20
+							 <s:set
 					var=3D"contextData"><%=3Daction.getContextData()%></s:set>=20
 			=09
 				<s:url var=3D"urlFragment" action=3D"%{#contextData}/wikittyInfo" namesp=
ace=3D"/fragment">
@@ -126,35 +126,50 @@
 				=09
 				=09
 				<sj:a targets=3D"wikittyInfo" href=3D"%{#urlFragment}">  view</sj:a>
+				=09
+				<%
+									    if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)
+									                        || w.hasExtension(WikittyPubData.EXT_WIKITT=
YPUBDATA)) {
+									%>=09
+					<a
+				href=3D"${urlraw}">Raw</a> <s:url var=3D"urleval"
+					action=3D"%{#localContext}/eval/elt_id:%{#wid}" /> <a
+				href=3D"${urleval}">Eval</a>
+				<!-- <a id=3D"ajaxlink_<%=3Di%>" href=3D"javascript:void(0)">View</a> -->
+				<%
+				    }
+				%>
=20
-			=09
 			</td>
 			<td><%=3Dw.getId()%></td>
 			<td><%=3Dw.getVersion()%></td>
 			<td><%=3Dw.getExtensionNames()%></td>
 			<td>
 			<%
-			String currentWikittyName =3D StringUtils.EMPTY;
-			if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)){
-			    currentWikittyName =3D WikittyPubTextHelper.getName(w);
-			} else if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) {
-			    currentWikittyName =3D WikittyPubDataHelper.getName(w);
-			}
+			    String currentWikittyName =3D StringUtils.EMPTY;
+			                if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) {
+			                    currentWikittyName =3D WikittyPubTextHelper
+			                            .getName(w);
+			                } else if (w
+			                        .hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA))=
 {
+			                    currentWikittyName =3D WikittyPubDataHelper
+			                            .getName(w);
+			                }
 			%>
 			<%=3DcurrentWikittyName%>
 			</td>
 		</tr>
 		<%
-			i++;
-		    }
+		    i++;
+		            }
 		%>
=20
=20
=20
 	</table>
 	<input type=3D"submit" name=3D"previous" value=3D"
-	<%=3Daction.getText("publication.view.previous") %>" /> <input
-		type=3D"submit" name=3D"next" value=3D"<%=3Daction.getText("publication.vi=
ew.next") %>" />
+	<%=3Daction.getText("publication.view.previous")%>" /> <input
+		type=3D"submit" name=3D"next" value=3D"<%=3Daction.getText("publication.vi=
ew.next")%>" />
 </form>
=20
=20

Modified: trunk/wikitty-publication-ui/src/main/webapp/index.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wikitty-publication-ui/src/main/webapp/index.jsp	2011-08-30 09:44:5=
3 UTC (rev 1202)
+++ trunk/wikitty-publication-ui/src/main/webapp/index.jsp	2011-08-30 10:32:5=
6 UTC (rev 1203)
@@ -1,22 +1,13 @@
-<%@ taglib prefix=3D"s" uri=3D"/struts-tags"%>
+<h1>Bienvenu dans Wikitty Publication</h1>
=20
-<%
-    out.println("hello !");
=20
-%>
+Voici les adresses permettant d'acc=EF=BF=BDder au diff=EF=BF=BDrentes pages=
/action
=20
-<s:url var=3D"urlviewpage" action=3D"wiki/view/" />
-<s:a href=3D"%{urlviewpage}" id=3D"urlviewpage">
-	<s:text name=3D"view" />
-</s:a>
+ * /[contextData]/[contextApps]/[action]/[mandatory_args]?[args key=3Dvalue]
+ou
+ * /[contextData]/[action]/[mandatory_args]?[args key=3Dvalue]
=20
+Adresses sans contextApps disponible pour toute les actions.
+Adresses avec contextApps disponible pour les actions : view, raw et eval.
=20
-<s:url var=3D"urleditpage" action=3D"wiki/edit/" />
-<s:a href=3D"%{urleditpage}" id=3D"urleditpage">
-	<s:text name=3D"edit" />
-</s:a>
=20
-
-
-
-

Modified: trunk/wp-maven-plugin/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wp-maven-plugin/pom.xml	2011-08-30 09:44:53 UTC (rev 1202)
+++ trunk/wp-maven-plugin/pom.xml	2011-08-30 10:32:56 UTC (rev 1203)
@@ -82,9 +82,13 @@
         <artifactId>jetty-maven-plugin</artifactId>
     </dependency>
=20
-  =20
     <dependency>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+    </dependency>   =20
+   =20
+    <dependency>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
     </dependency> =20
=20


--===============6760543012755334999==--