Bow-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- 617 discussions
Author: vbriand
Date: 2010-12-09 18:39:38 +0100 (Thu, 09 Dec 2010)
New Revision: 133
Url: http://chorem.org/repositories/revision/bow/133
Log:
A long list of tags doesn't overlap the following bookmark anymore
Modified:
trunk/src/main/webapp/css/bookmark.css
trunk/src/main/webapp/tagsCloud.jsp
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2010-12-09 16:13:01 UTC (rev 132)
+++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 17:39:38 UTC (rev 133)
@@ -79,8 +79,8 @@
.bookmark{
width:100%;
- height: auto;
- word-wrap: break-word;
+ height:auto;
+ word-wrap:break-word;
}
.bookmark .bookmarkhead{
@@ -95,7 +95,7 @@
.bookmark .bookmarkcontenu{
clear:both;
padding-top:5px;
- padding-right: 108px;
+ padding-right: 132px;
}
.bookmark .bookmarkhead .date{
@@ -173,7 +173,8 @@
background:url('/bow/img/tag.jpg') no-repeat left center;
font-size:12px;
padding-left:30px;
- height:28px;
+ height:auto;
+ width:100%;
line-height:28px;
padding-top:10px;
margin-bottom: -140px;
@@ -308,7 +309,7 @@
display:inline-block;
padding-right:9%;
text-align:right;
- width:10%;
+ width:45px;
}
#colonneD form input[type="submit"]{
Modified: trunk/src/main/webapp/tagsCloud.jsp
===================================================================
--- trunk/src/main/webapp/tagsCloud.jsp 2010-12-09 16:13:01 UTC (rev 132)
+++ trunk/src/main/webapp/tagsCloud.jsp 2010-12-09 17:39:38 UTC (rev 133)
@@ -40,7 +40,7 @@
String tagName = tag.getTopicName();
int font = bookmarkActions.getFont(value);
%>
- <a href="bow?action=search&addTag=<%=tagName%><%=search%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a>
+ <a href="bow?action=search&addTag=<%=tagName%><%=search%>" title="<%=value%> result<%=(value != 1 ? "s" : "")%>" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a>
<%
++count;
if (count >= nbTags) {
1
0
Author: vbriand
Date: 2010-12-09 17:13:01 +0100 (Thu, 09 Dec 2010)
New Revision: 132
Url: http://chorem.org/repositories/revision/bow/132
Log:
Fixed the tags cloud display which was bugged on Firefox
Modified:
trunk/src/main/webapp/css/bookmark.css
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2010-12-09 15:26:41 UTC (rev 131)
+++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 16:13:01 UTC (rev 132)
@@ -274,7 +274,7 @@
#colonneD .recherche,
#colonneD #import,
#colonneD #add{
- padding: 4% 10%;
+ padding:4% 10%;
border-bottom:2px solid #9edcf8;
}
@@ -284,6 +284,10 @@
font-weight:normal;
}
+#colonneD #add{
+ height:auto;
+}
+
#colonneD #add form{
clear:both;
}
@@ -297,7 +301,7 @@
width:50%;
border:none;
height:28px;
- padding-left: 4px;
+ padding-left:4px;
}
#colonneD #add form label{
1
0
Author: vbriand
Date: 2010-12-09 16:26:41 +0100 (Thu, 09 Dec 2010)
New Revision: 131
Url: http://chorem.org/repositories/revision/bow/131
Log:
Fixed the links color in the footer
Modified:
trunk/src/main/webapp/css/global.css
Modified: trunk/src/main/webapp/css/global.css
===================================================================
--- trunk/src/main/webapp/css/global.css 2010-12-09 15:10:22 UTC (rev 130)
+++ trunk/src/main/webapp/css/global.css 2010-12-09 15:26:41 UTC (rev 131)
@@ -99,8 +99,11 @@
padding-top:30px;
}
+#footer a{
+ color:#bf8a9c;
+}
+
#footer p{
- color:#bf8a9c;
font-size:14px;
text-align:center;
line-height:50px;
1
0
Author: vbriand
Date: 2010-12-09 16:10:22 +0100 (Thu, 09 Dec 2010)
New Revision: 130
Url: http://chorem.org/repositories/revision/bow/130
Log:
When there is a lot of tags, they are now displayed correctly on the tags cloud
Modified:
trunk/src/main/webapp/css/bookmark.css
trunk/src/main/webapp/rightMenu.jsp
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2010-12-09 13:27:00 UTC (rev 129)
+++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 15:10:22 UTC (rev 130)
@@ -325,7 +325,9 @@
}
#colonneD #nuage{
+ padding-right:80px;
min-height:100px;
+ text-align:justify;
}
.colonnebas img{
Modified: trunk/src/main/webapp/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/rightMenu.jsp 2010-12-09 13:27:00 UTC (rev 129)
+++ trunk/src/main/webapp/rightMenu.jsp 2010-12-09 15:10:22 UTC (rev 130)
@@ -91,7 +91,6 @@
<li><a title="Add this link to your favourites to bookmark others in the future. This link is just available while you are connected on the site!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Bookmark add link (session)</a></li>
<li><a title="Add this link to your favourites to bookmark others in the future. This link is always available!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Bookmark add link (permanent)</a></li>
</ul>
-
<div id="add" class="clearfix">
<h2>Add / Modify</h2>
<form id="bookmarkForm" method="post" action="<%=formAction%>">
@@ -102,7 +101,6 @@
<div class="input"><input type="submit" value="Save" /></div>
</form>
</div>
-
<div id="nuage">
<% if (searchLine != null) { %>
<jsp:include page="tagsCloud.jsp" flush="true">
1
0
r129 - in trunk/src/main: java/org/chorem/bow webapp webapp/css
by vbriand＠users.chorem.org 09 Dec '10
by vbriand＠users.chorem.org 09 Dec '10
09 Dec '10
Author: vbriand
Date: 2010-12-09 14:27:00 +0100 (Thu, 09 Dec 2010)
New Revision: 129
Url: http://chorem.org/repositories/revision/bow/129
Log:
Fixed css issue when the bookmark description is too long or if there are too many tags
Modified:
trunk/src/main/java/org/chorem/bow/UserMigration.java
trunk/src/main/webapp/bookmark.jsp
trunk/src/main/webapp/css/bookmark.css
Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 10:08:11 UTC (rev 128)
+++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-12-09 13:27:00 UTC (rev 129)
@@ -68,7 +68,7 @@
try {
password = StringUtil.encodeMD5(password);
} catch (RuntimeException ex) {
- throw new WikittyException("Could not encore password", ex);
+ throw new WikittyException("Could not encode password", ex);
}
obj = password;
}
Modified: trunk/src/main/webapp/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/bookmark.jsp 2010-11-23 10:08:11 UTC (rev 128)
+++ trunk/src/main/webapp/bookmark.jsp 2010-12-09 13:27:00 UTC (rev 129)
@@ -35,17 +35,14 @@
String aliasUrl = BowConfig.getInstance().getServletAliasUrl();
String search = "";
String searchLine = request.getParameter("searchLine");
-if (searchLine != null)
-{
+if (searchLine != null) {
search += "&searchLine=" + searchLine;
}
String fullTextLine = request.getParameter("fullTextLine");
-if (fullTextLine != null)
-{
+if (fullTextLine != null) {
search += "&fullTextLine=" + fullTextLine;
}
-if (url != null && bookmark != null && sdf != null && bookmarkActions != null)
-{
+if (url != null && bookmark != null && sdf != null && bookmarkActions != null) {
String formBookmarkId = (String) request.getAttribute("formBookmarkId");
String link = bookmark.getLink();
link = link.replace("'", "\\'");
@@ -70,27 +67,20 @@
<strong>Tags :</strong>
<%
Set<String> tagList = bookmark.getTags();
- if (tagList != null && !tagList.isEmpty())
- {
- for (String tag : tagList)
- {
- if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId()))
- {
+ if (tagList != null && !tagList.isEmpty()) {
+ for (String tag : tagList) {
+ if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) {
%>
<a style="text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%><%=search%>">
<img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" />
</a>
<%
- }
- else
- {
+ } else {
%>
<a name="<%=bookmark.getWikittyId()%>" style="display:none; text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%><%=search%>">
<img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" />
</a>
- <%
- }
- %>
+ <% } %>
<a href="bow?action=search&searchLine=<%=tag%>" style="text-decoration: none"><%=tag%></a>
<%
}
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2010-11-23 10:08:11 UTC (rev 128)
+++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 13:27:00 UTC (rev 129)
@@ -79,6 +79,8 @@
.bookmark{
width:100%;
+ height: auto;
+ word-wrap: break-word;
}
.bookmark .bookmarkhead{
@@ -93,6 +95,7 @@
.bookmark .bookmarkcontenu{
clear:both;
padding-top:5px;
+ padding-right: 108px;
}
.bookmark .bookmarkhead .date{
@@ -155,7 +158,10 @@
margin:5px 5px;
color:#999999;
font-size:12px;
- width:auto;
+ position: relative;
+ width: 100%;
+ top:-80px;
+ left: 100px;
}
.bookmark .description h3{
@@ -170,16 +176,17 @@
height:28px;
line-height:28px;
padding-top:10px;
+ margin-bottom: -140px;
}
.bookmark .click{
background:transparent url('/bow/img/click.jpg') no-repeat scroll 0 0;
float:right;
height:27px;
- margin:5% 5px 5px;
+ margin:5px 5px 5px 5px;
padding-top:31px;
position:relative;
- right:0;
+ right:-100px;
width:31px;
text-align:center;
}
@@ -325,7 +332,7 @@
width:86%;
height:auto;
display:block;
- posit:relative;
+ position:relative;
}
#import .input input{
1
0
Author: tchemit
Date: 2010-11-23 11:08:11 +0100 (Tue, 23 Nov 2010)
New Revision: 128
Url: http://chorem.org/repositories/revision/bow/128
Log:
please respect the xsd
Modified:
trunk/src/main/webapp/WEB-INF/web.xml
Modified: trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml 2010-11-23 09:59:08 UTC (rev 127)
+++ trunk/src/main/webapp/WEB-INF/web.xml 2010-11-23 10:08:11 UTC (rev 128)
@@ -23,41 +23,42 @@
#L%
-->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app id="bow" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
- <!-- SERVLET -->
+ <!-- SERVLET -->
- <servlet>
- <servlet-class>org.chorem.bow.ControllerServlet</servlet-class>
- <servlet-name>Controller</servlet-name>
- </servlet>
+ <servlet>
+ <servlet-name>Controller</servlet-name>
+ <servlet-class>org.chorem.bow.ControllerServlet</servlet-class>
+ </servlet>
- <servlet>
- <servlet-class>org.chorem.bow.AliasServlet</servlet-class>
- <servlet-name>Alias</servlet-name>
- </servlet>
+ <servlet>
+ <servlet-name>Alias</servlet-name>
+ <servlet-class>org.chorem.bow.AliasServlet</servlet-class>
+ </servlet>
- <welcome-file-list>
- <welcome-file>bow</welcome-file>
- </welcome-file-list>
+ <welcome-file-list>
+ <welcome-file>bow</welcome-file>
+ </welcome-file-list>
- <listener>
- <listener-class>org.chorem.bow.ControllerServlet</listener-class>
- </listener>
+ <!-- tchemit 2010-11-23 : arch this is not a listener -->
+ <!--listener>
+ <listener-class>org.chorem.bow.ControllerServlet</listener-class>
+ </listener-->
- <!-- SERVLET MAPPING -->
+ <!-- SERVLET MAPPING -->
- <servlet-mapping>
- <servlet-name>Controller</servlet-name>
- <url-pattern>/bow</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Controller</servlet-name>
+ <url-pattern>/bow</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Alias</servlet-name>
- <url-pattern>/alias/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Alias</servlet-name>
+ <url-pattern>/alias/*</url-pattern>
+ </servlet-mapping>
</web-app>
1
0
Author: tchemit
Date: 2010-11-23 10:59:08 +0100 (Tue, 23 Nov 2010)
New Revision: 127
Url: http://chorem.org/repositories/revision/bow/127
Log:
use commans-lang
Modified:
trunk/src/main/java/org/chorem/bow/AliasServlet.java
Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-11-23 09:58:06 UTC (rev 126)
+++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-11-23 09:59:08 UTC (rev 127)
@@ -28,6 +28,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
import org.nuiton.wikitty.Criteria;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
@@ -61,7 +63,7 @@
throws IOException, ServletException {
try {
String alias = request.getPathInfo();
- if (alias != null && !alias.isEmpty()) {
+ if (!StringUtils.isEmpty(alias)) {
// remove first '/'
alias = alias.substring(1);
WikittyProxy proxy = BowProxy.getInstance();
1
0
Author: tchemit
Date: 2010-11-23 10:58:06 +0100 (Tue, 23 Nov 2010)
New Revision: 126
Url: http://chorem.org/repositories/revision/bow/126
Log:
no debug level!
want to listen nuiton packages too :)
use commans-lang
Modified:
trunk/src/main/resources/log4j.properties
Modified: trunk/src/main/resources/log4j.properties
===================================================================
--- trunk/src/main/resources/log4j.properties 2010-11-23 09:08:26 UTC (rev 125)
+++ trunk/src/main/resources/log4j.properties 2010-11-23 09:58:06 UTC (rev 126)
@@ -30,4 +30,5 @@
log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n
# package level
-log4j.logger.org.chorem.bow=DEBUG
+log4j.logger.org.chorem.bow=INFO
+log4j.logger.org.nuiton=INFO
1
0
r125 - in trunk: . src/license src/main/java/org/chorem/bow src/main/resources src/main/webapp src/main/webapp/WEB-INF src/main/webapp/css src/site src/site/rst src/site/rst/developper src/site/rst/user
by tchemit＠users.chorem.org 23 Nov '10
by tchemit＠users.chorem.org 23 Nov '10
23 Nov '10
Author: tchemit
Date: 2010-11-23 10:08:26 +0100 (Tue, 23 Nov 2010)
New Revision: 125
Url: http://chorem.org/repositories/revision/bow/125
Log:
reformat pom
clean pom
optimize dependencies
consolidate thrid-party file
add license headers
fix a lot of dirty codes, but there is still some (ControllerServlet is a nightmare...)
Modified:
trunk/pom.xml
trunk/src/license/THIRD-PARTY.properties
trunk/src/main/java/org/chorem/bow/AliasServlet.java
trunk/src/main/java/org/chorem/bow/BookmarkActions.java
trunk/src/main/java/org/chorem/bow/BowConfig.java
trunk/src/main/java/org/chorem/bow/BowProxy.java
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/java/org/chorem/bow/OpenSearchActions.java
trunk/src/main/java/org/chorem/bow/UserMigration.java
trunk/src/main/resources/bow.properties
trunk/src/main/resources/log4j.properties
trunk/src/main/resources/wikitty-jdbc-config.properties
trunk/src/main/webapp/WEB-INF/web.xml
trunk/src/main/webapp/admin.jsp
trunk/src/main/webapp/bookmark.jsp
trunk/src/main/webapp/bookmarkTop.jsp
trunk/src/main/webapp/css/bookmark.css
trunk/src/main/webapp/css/connexion.css
trunk/src/main/webapp/css/global.css
trunk/src/main/webapp/error.jsp
trunk/src/main/webapp/errorFrame.jsp
trunk/src/main/webapp/footer.jsp
trunk/src/main/webapp/forgotPassword.jsp
trunk/src/main/webapp/header.jsp
trunk/src/main/webapp/home.jsp
trunk/src/main/webapp/login.jsp
trunk/src/main/webapp/permanentXml.jsp
trunk/src/main/webapp/preferences.jsp
trunk/src/main/webapp/register.jsp
trunk/src/main/webapp/rightMenu.jsp
trunk/src/main/webapp/search.jsp
trunk/src/main/webapp/suggestions.jsp
trunk/src/main/webapp/tagsCloud.jsp
trunk/src/main/webapp/temporaryXml.jsp
trunk/src/site/rst/developper/installation.rst
trunk/src/site/rst/developper/presentation.rst
trunk/src/site/rst/index.rst
trunk/src/site/rst/todo.rst
trunk/src/site/rst/user/alias.rst
trunk/src/site/rst/user/importExport.rst
trunk/src/site/rst/user/openSearch.rst
trunk/src/site/rst/user/search.rst
trunk/src/site/rst/user/token.rst
trunk/src/site/site.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/pom.xml 2010-11-23 09:08:26 UTC (rev 125)
@@ -52,22 +52,31 @@
<version>${wikittyVersion}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-solr-impl</artifactId>
<version>${wikittyVersion}</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.11</version>
+ <version>${slf4jVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.2.134</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -75,13 +84,29 @@
<artifactId>nuiton-utils</artifactId>
<version>${nuitonUtilsVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ <version>${nuitonI18nVersion}</version>
+ </dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
</dependency>
+
<dependency>
<groupId>org.htmlparser</groupId>
<artifactId>htmlparser</artifactId>
@@ -118,12 +143,14 @@
<projectId>bow</projectId>
<nuitonUtilsVersion>1.4.2</nuitonUtilsVersion>
+ <nuitonI18nVersion>2.0</nuitonI18nVersion>
<wikittyVersion>2.0</wikittyVersion>
-
+ <slf4jVersion>1.6.1</slf4jVersion>
+
<locales>en</locales>
<!-- license to use -->
- <license.licenseName>gpl_v3</license.licenseName>
+ <license.licenseName>agpl_v3</license.licenseName>
</properties>
@@ -162,34 +189,17 @@
<executions>
<execution>
<id>api generator</id>
- <!--
- do not use the phase generate-XXX because it can be excecuted
- several times...
- -->
<phase>process-sources</phase>
- <!--Configuration of model generator-->
<configuration>
<inputs>
<input>zargo</input>
</inputs>
- <!--<addCompileDirectory>true</addCompileDirectory>-->
- <!--<zargoResources>-->
- <!--<input>${maven.src.dir}/main/xmi</input>-->
- <!--</zargoResources>-->
- <!--<xmiResources>-->
- <!--<inputs>-->
- <!--<input>${maven.gen.dir}/xmi</input>-->
- <!--</inputs>-->
- <!--</xmiResources>-->
- <!--<includes>**/*.objectmodel</includes>-->
<resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
<templates>org.nuiton.wikitty.generator.WikittyMetaGenerator
</templates>
- <!--<defaultPackage>com.jurismarches.vradi</defaultPackage>-->
<inputs>zargo</inputs>
<fullPackagePath>org.chorem.bow</fullPackagePath>
- <!--<extractedPackages>org.chorem.bow</extractedPackages>-->
<generatedPackages>org.chorem.bow</generatedPackages>
</configuration>
<goals>
@@ -203,7 +213,7 @@
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-generators</artifactId>
<version>${wikittyVersion}</version>
- </dependency>
+ </dependency>
</dependencies>
</plugin>
Modified: trunk/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/src/license/THIRD-PARTY.properties 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/license/THIRD-PARTY.properties 2010-11-23 09:08:26 UTC (rev 125)
@@ -6,13 +6,13 @@
# - Apache Software License, version 1.1
# - BSD License
# - CDDL
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Development and Distribution License (CDDL) v1.0
# - Common Public License
-# - Common Public License Version 1.0
# - GPLv2+CE
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - LGPL 2.1
-# - Lesser General Public License (LGPL)
+# - LGPL 2.1 / The Apache Software License - Version 2.0
# - Lesser General Public License (LGPL) v 3.0
# - MIT License
# - Public Domain
@@ -22,10 +22,10 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Jul 22 10:05:51 CEST 2010
-com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0
-commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0
-woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0
+#Tue Nov 23 09:14:09 CET 2010
+com.experlog--xapool--1.5.0--jar=Lesser General Public License (LGPL) v 3.0
+commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0
+javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0
+jgroups--jgroups--2.9.0.GA--jar=Lesser General Public License (LGPL) v 3.0
+woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0
Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -28,7 +28,6 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.nuiton.util.ArgumentsParserException;
import org.nuiton.wikitty.Criteria;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
@@ -42,7 +41,7 @@
private static final long serialVersionUID = 1L;
protected String bowServletUrl = "";
- public AliasServlet() throws ArgumentsParserException {
+ public AliasServlet() {
BowConfig config = BowConfig.getInstance();
bowServletUrl = config.getBowUrl() + config.getServletBow() ;
}
@@ -50,7 +49,7 @@
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
- this.doPost(request, response);
+ doPost(request, response);
}
/* @param request servlet request
Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -82,7 +82,7 @@
* @return String the html file
*/
public static String getExportHtmlBookmark(List<Bookmark> bookmarks) {
- String export = "";
+ String export;
export = "<!DOCTYPE NETSCAPE-Bookmark-file-1>\n"
+ "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\">\n"
+ "<DL><p>\n";
@@ -183,14 +183,18 @@
if (tags != null && !tags.isEmpty()) {
tags = tags.trim();
String[] tagsTab = tags.split("\\s+"); // put the tags in an array
- for (int i = 0; i < tagsTab.length; ++i) {
+ for (String aTagsTab : tagsTab) {
+ if (aTagsTab == null) {
+
+ continue;
+ }
Set<String> tagList = bookmark.getTags();
- if (tagList != null && tagsTab[i] != null) {
- if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) {
- bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank)
+ if (tagList != null) {
+ if (!tagList.contains(aTagsTab) && !aTagsTab.isEmpty()) {
+ bookmark.addTags(aTagsTab); // Added tag for each rank (one tag by rank)
}
- } else if (!tagsTab[i].isEmpty()) {
- bookmark.addTags(tagsTab[i]);
+ } else if (!aTagsTab.isEmpty()) {
+ bookmark.addTags(aTagsTab);
}
}
}
@@ -307,9 +311,9 @@
if (!str.isEmpty()) {
str = str.trim();
String[] tags = str.split("\\s+");
- for (int i = 0; i < tags.length; i++) {
- if (!tagsSearch.contains(tags[i])) {
- tagsSearch.add(tags[i]);
+ for (String tag : tags) {
+ if (!tagsSearch.contains(tag)) {
+ tagsSearch.add(tag);
}
}
}
@@ -366,7 +370,7 @@
public int getFont(int ti) {
int font = 1;
if (tmax > tmin) {
- font = (30 * (ti - tmin)) / (tmax - tmin); // get the font size for a tag frequency
+ font = 30 * (ti - tmin) / (tmax - tmin); // get the font size for a tag frequency
}
if (font < 10) {
font = 10;
Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -45,10 +45,9 @@
/** to use log facility, just put in your code: log.info(\"...\"); */
static private Log log = LogFactory.getLog(BowConfig.class);
/** Singleton instance. */
- protected static BowConfig instance = null;
+ protected static BowConfig instance;
public BowConfig() {
- super();
// set default option (included configuration file name : important)
for (Option o : Option.values()) {
@@ -62,7 +61,7 @@
if (instance == null) {
try {
instance = new BowConfig();
- instance.parse(new String[]{});
+ instance.parse(StringUtil.EMPTY_STRING_ARRAY);
instance.setDataDirInSystemProps();
} catch (Exception e) {
throw new UnhandledException(e);
@@ -194,7 +193,7 @@
/**
* Vradi option definition.
*/
- public static enum Option {
+ public enum Option {
CONFIG_FILE(CONFIG_FILE_NAME, _("bow.config.configFileName.description"),
"bow.properties", String.class, false, false),
@@ -225,7 +224,7 @@
public final boolean isTransient;
public final boolean isFinal;
- private Option(String key, String description, String defaultValue,
+ Option(String key, String description, String defaultValue,
Class<?> type, boolean isTransient, boolean isFinal) {
this.key = key;
this.description = description;
Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -65,7 +65,7 @@
TokenImpl.extensionToken);
WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions());
ws = new WikittyServiceCached(ws);
- String token = super.getSecurityToken();
+ String token = getSecurityToken();
ws.storeExtension(token, extensions);
setWikittyService(ws);
}
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -43,7 +43,6 @@
import javax.mail.internet.MimeMessage;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -60,7 +59,6 @@
import org.htmlparser.util.NodeList;
import org.htmlparser.util.ParserException;
import org.htmlparser.util.SimpleNodeIterator;
-import org.nuiton.util.ArgumentsParserException;
import org.nuiton.util.StringUtil;
import org.nuiton.wikitty.Criteria;
import org.nuiton.wikitty.FacetTopic;
@@ -79,7 +77,7 @@
protected String version = "";
protected String bowServletUrl = "";
- public ControllerServlet() throws ArgumentsParserException, Exception {
+ public ControllerServlet() throws Exception {
BowConfig config = BowConfig.getInstance();
version = config.getVersion();
bowServletUrl = config.getBowUrl();
@@ -92,7 +90,7 @@
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
- this.doPost(request, response);
+ doPost(request, response);
}
/* @param request servlet request
@@ -120,7 +118,7 @@
if (log.isDebugEnabled()) {
log.debug("Going to actionRegister");
}
- this.actionRegister(request, response, session);
+ actionRegister(request, response, session);
} else if (action.equals("registration")) {
if (log.isDebugEnabled()) {
log.debug("Going to Register");
@@ -135,85 +133,85 @@
if (log.isDebugEnabled()) {
log.debug("Going to actionLogin");
}
- this.actionLogin(request, response, session);
+ actionLogin(request, response, session);
} else if (action.equals("logout")) {
if (log.isDebugEnabled()) {
log.debug("Going to actionLogout");
}
- this.actionLogout(request, response, session);
+ actionLogout(request, response, session);
} else if (action.equals("home")) {
if (log.isDebugEnabled()) {
log.debug("Going to actionHome.jsp");
}
- this.actionHome(request, response, session);
+ actionHome(request, response, session);
} else if (action.equals("addUrl") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionAddUrl");
}
- this.actionAddUrl(request, response, user);
+ actionAddUrl(request, response, user);
} else if (action.equals("sendPassword")) {
if (log.isDebugEnabled()) {
log.debug("Going to actionSendPassword");
}
- this.actionSendPassword(request, response);
+ actionSendPassword(request, response);
} else if (action.equals("modifyBookmark") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionModif");
}
- this.actionModifyBookmark(request, response, user);
+ actionModifyBookmark(request, response, user);
} else if (action.equals("importBookmarks") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionImportBookmarks");
}
- this.actionImportBookmarks(request, response, user);
+ actionImportBookmarks(request, response, user);
} else if (action.equals("exportBookmarks") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionExportBookmarks");
}
- this.actionExportBookmarks(response, user);
+ actionExportBookmarks(response, user);
} else if (action.equals("search") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionSearch");
}
- this.actionSearch(request, user);
+ actionSearch(request, user);
request.getRequestDispatcher("search.jsp").forward(request, response);
} else if (action.equals("generateToken") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionGenerateToken");
}
- this.actionGenerateToken(request, response, user, session);
+ actionGenerateToken(request, response, user, session);
request.getRequestDispatcher("preferences.jsp").forward(request, response);
} else if (action.equals("deleteTag") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionDeleteTag");
}
- this.actionDeleteTag(request, response, user);
+ actionDeleteTag(request, response, user);
} else if (action.equals("addAlias") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionAddAlias");
}
- this.actionAddAlias(request, response);
+ actionAddAlias(request, response);
} else if (action.equals("removeBookmark") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionRemoveBookmark");
}
- this.actionRemoveBookmark(request, response, user);
+ actionRemoveBookmark(request, response, user);
} else if (action.equals("editBookmark") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionEditBookmark");
}
- this.actionEditBookmark(request, response, user);
+ actionEditBookmark(request, response, user);
} else if (action.equals("order") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionOrder");
}
- this.actionOrder(request, response, user);
+ actionOrder(request, response, user);
request.getRequestDispatcher("search.jsp").forward(request, response);
} else if (action.equals("addClick") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionAddClic");
}
- this.actionAddClick(request, response);
+ actionAddClick(request, response);
} else if (action.equals("temporaryXml")) {
if (log.isDebugEnabled()) {
log.debug("Going to temporaryXml.jsp");
@@ -228,30 +226,30 @@
if (log.isDebugEnabled()) {
log.debug("Going to actionOpenSearchSuggestion");
}
- this.actionOpenSearchSuggestion(request, response, user);
+ actionOpenSearchSuggestion(request, response, user);
request.getRequestDispatcher("suggestions.jsp").forward(request, response);
} else if (action.equals("openSearchResult") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionOpenSearchResult");
}
- this.actionOpenSearchResult(request, response, session, user, token);
+ actionOpenSearchResult(request, response, session, user, token);
} else if (action.equals("fullText") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionFullText");
}
- this.actionFullText(request, user);
+ actionFullText(request, user);
request.getRequestDispatcher("search.jsp").forward(request, response);
} else if (action.equals("preferences") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionPreferences");
}
- this.getBookmarksByImportDate(request, user);
+ getBookmarksByImportDate(request, user);
request.getRequestDispatcher("preferences.jsp").forward(request, response);
} else if (action.equals("admin") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionAdmin");
}
- if ((Boolean)session.getAttribute("admin") == true) {
+ if ((Boolean) session.getAttribute("admin")) {
request.getRequestDispatcher("admin.jsp").forward(request, response);
} else {
request.getRequestDispatcher("login.jsp").forward(request, response);
@@ -260,25 +258,25 @@
if (log.isDebugEnabled()) {
log.debug("Going to actionChangePreferences");
}
- this.actionChangePreferences(request, session, user);
+ actionChangePreferences(request, session, user);
request.getRequestDispatcher("preferences.jsp").forward(request, response);
} else if (action.equals("deleteImport") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionDeleteImport");
}
- this.actionDeleteImport(request, response, user);
+ actionDeleteImport(request, response, user);
//request.getRequestDispatcher("preferences.jsp").forward(request, response);
} else if (action.equals("reIndexation") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionReIndexation");
}
- this.actionReIndexation(request, session, user);
+ actionReIndexation(request, session, user);
request.getRequestDispatcher("admin.jsp").forward(request, response);
} else if (action.equals("deleteSearchResults") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionDeleteSearchResults");
}
- this.actionDeleteSearchResults(request, response, user);
+ actionDeleteSearchResults(request, response, user);
}
else {
if (user != null) {
@@ -303,7 +301,9 @@
* @throws IOException If the redirection fails
* @description Deletes every bookmark imported at a given date
*/
- protected void actionDeleteImport(HttpServletRequest request, HttpServletResponse response, User user) throws IOException {
+ protected void actionDeleteImport(HttpServletRequest request,
+ HttpServletResponse response,
+ User user) throws IOException {
String date = request.getParameter("date");
if (date != null) {
@@ -336,7 +336,7 @@
if (searchLine != null && fullText != null) {
WikittyProxy proxy = BowProxy.getInstance();
- Criteria criteria = null;
+ Criteria criteria;
if (fullText.isEmpty()) {
criteria = getBookmarkListCriteriaByUser(user, searchLine);
} else {
@@ -346,8 +346,8 @@
List<String> ids = new ArrayList<String>();
for (Bookmark bookmark : bookmarks) {
- if (((searchLine.isEmpty() && bookmark.getTags() == null) || !searchLine.isEmpty()) ||
- (fullText.isEmpty() && bookmark.getTags() == null) || !fullText.isEmpty()) {
+ if (searchLine.isEmpty() && bookmark.getTags() == null || !searchLine.isEmpty() ||
+ fullText.isEmpty() && bookmark.getTags() == null || !fullText.isEmpty()) {
ids.add(bookmark.getWikittyId());
}
}
@@ -404,7 +404,9 @@
* @throws ServletException if a servlet error occurs
* @description set the openSearch suggestions
*/
- protected void actionOpenSearchSuggestion(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionOpenSearchSuggestion(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
if (user != null) {
String search = request.getParameter("searchLine");
@@ -416,7 +418,7 @@
if (search.charAt(search.length() - 1) == ' ') {
searchLine.add(""); // if the user types nothing we have to propose suggestions
}
- Criteria criteria = null;
+ Criteria criteria;
if (searchLine.size() > 1) {
List<String> cpy = new ArrayList<String>(searchLine);
cpy.remove(cpy.size() - 1);
@@ -443,7 +445,9 @@
* @throws ServletException if a servlet error occurs
* @description delete the session
*/
- protected void actionLogout(HttpServletRequest request, HttpServletResponse response, HttpSession session)
+ protected void actionLogout(HttpServletRequest request,
+ HttpServletResponse response,
+ HttpSession session)
throws IOException, ServletException {
session.invalidate();
request.getRequestDispatcher("login.jsp").forward(request, response);
@@ -478,7 +482,9 @@
* @throws ServletException if a servlet error occurs
* @description order the bookmarks by type
*/
- protected void actionOrder(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionOrder(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
String type = request.getParameter("type");
String searchLine = request.getParameter("searchLine");
@@ -516,7 +522,9 @@
* @throws ServletException if a servlet error occurs
* @description edit the bookmark
*/
- protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionEditBookmark(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
if (bookmarkId != null && !bookmarkId.isEmpty()) {
@@ -547,7 +555,9 @@
* @throws ServletException if a servlet error occurs
* @description remove the bookmark
*/
- protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionRemoveBookmark(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
if (bookmarkId != null && !bookmarkId.isEmpty()) {
@@ -570,7 +580,9 @@
* @throws ServletException if a servlet error occurs
* @description delete the bookmark tag
*/
- protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionDeleteTag(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
String tag = request.getParameter("deleteTag");
@@ -595,7 +607,10 @@
* @throws ServletException if a servlet error occurs
* @description delete the current token and generate an another
*/
- protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user, HttpSession session)
+ protected void actionGenerateToken(HttpServletRequest request,
+ HttpServletResponse response,
+ User user,
+ HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
WikittyProxy proxy = BowProxy.getInstance();
@@ -622,7 +637,9 @@
}
}
- protected void actionModifyBookmark(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionModifyBookmark(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException {
String link = request.getParameter("url"); // bowServletUrl of the website
String name = request.getParameter("name"); // website name
@@ -650,7 +667,9 @@
* @throws ServletException if a servlet error occurs
* @description add a new bookmark
*/
- protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user)
+ protected void actionAddUrl(HttpServletRequest request,
+ HttpServletResponse response,
+ User user)
throws IOException, ServletException {
addUrl(request, user);
redirectToTheGoodPage(request, response);
@@ -691,7 +710,7 @@
* token owner
*/
protected User checkToken(String token, HttpSession session) {
- if (checkTemporaryToken(token, session) == true) {
+ if (checkTemporaryToken(token, session)) {
User user = (User) session.getAttribute("user");
return user;
}
@@ -774,7 +793,9 @@
* @return bookmarkActions the bookmarkAction
* @description create the tagCLoud by research type
*/
- protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult<Bookmark> result, String searchLine) {
+ protected BookmarkActions createBookmarkActions(HttpServletRequest request,
+ PagedResult<Bookmark> result,
+ String searchLine) {
String fullText = request.getParameter("fullTextLine");
BookmarkActions bookmarkActions = new BookmarkActions();
bookmarkActions.setFullTextLine(fullText);
@@ -800,16 +821,18 @@
* @throws ServletException if a servlet error occurs
* @description check if the registration is correct or not
*/
- protected void actionRegister(HttpServletRequest request, HttpServletResponse response, HttpSession session)
- throws IOException, ServletException, NoSuchAlgorithmException, AddressException, MessagingException {
+ protected void actionRegister(HttpServletRequest request,
+ HttpServletResponse response,
+ HttpSession session)
+ throws IOException, ServletException, NoSuchAlgorithmException, MessagingException {
String email = request.getParameter("email");
if (email != null) {
email = email.trim();
String password = request.getParameter("password");
- String md5 = null;
+ String md5;
if (password != null) {
md5 = StringUtil.encodeMD5(password);
- if (!this.checkRegister(email, md5, request)) { // check if all is well
+ if (!checkRegister(email, md5, request)) { // check if all is well
WikittyProxy proxy = BowProxy.getInstance();
UserImpl newUser = new UserImpl();
newUser.setPassword(md5);
@@ -835,16 +858,18 @@
* @throws ServletException if a servlet error occurs
* @description check if the authentication is correct or not
*/
- protected void actionLogin(HttpServletRequest request, HttpServletResponse response, HttpSession session)
+ protected void actionLogin(HttpServletRequest request,
+ HttpServletResponse response,
+ HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
String email = request.getParameter("email");
if (email != null) {
email = email.trim();
String password = request.getParameter("password");
- String md5 = null;
+ String md5;
if (password != null) {
md5 = StringUtil.encodeMD5(password);
- User login = this.checkLogin(email, md5, request); // check if the user exists
+ User login = checkLogin(email, md5, request); // check if the user exists
if (login != null) {
initSession(session, login);
initHomePage(request, login);
@@ -859,8 +884,8 @@
protected void checkAdmin(String login, HttpSession session) {
String[] admins = BowConfig.getInstance().getAdmins();
if (admins != null) {
- for (int count = 0; count < admins.length; ++count) {
- if (login.equals(admins[count])) {
+ for (String admin : admins) {
+ if (login.equals(admin)) {
session.setAttribute("admin", true);
return;
}
@@ -899,7 +924,9 @@
* @return null the user doesn't exist
* @return User the user exists
*/
- protected User checkLogin(String email, String password, HttpServletRequest request) throws NoSuchAlgorithmException {
+ protected User checkLogin(String email,
+ String password,
+ HttpServletRequest request) throws NoSuchAlgorithmException {
if (email != null && password != null) {
if (!email.isEmpty() && !password.equals(StringUtil.encodeMD5(""))) {
WikittyProxy proxy = BowProxy.getInstance();
@@ -922,7 +949,9 @@
* @param password String which contains the user password
* @return boolean false if the user doesn't exist or true
*/
- protected boolean checkRegister(String email, String password, HttpServletRequest request) throws NoSuchAlgorithmException {
+ protected boolean checkRegister(String email,
+ String password,
+ HttpServletRequest request) throws NoSuchAlgorithmException {
if (email != null && password != null) {
if (!email.isEmpty() && !password.equals(StringUtil.encodeMD5(""))) {
WikittyProxy proxy = BowProxy.getInstance();
@@ -974,7 +1003,9 @@
* @param user User user
* @description initialize all for the home page
*/
- protected void actionHome(HttpServletRequest request, HttpServletResponse response, HttpSession session)
+ protected void actionHome(HttpServletRequest request,
+ HttpServletResponse response,
+ HttpSession session)
throws ServletException, IOException, NoSuchAlgorithmException {
User user = (User) session.getAttribute("user");
if (user == null) {
@@ -1027,7 +1058,7 @@
throws IOException, FileUploadException, ServletException {
// Check that we have a file upload request
boolean isMultipart = ServletFileUpload.isMultipartContent(request);
- if (isMultipart == true) {
+ if (isMultipart) {
// Create a factory for disk-based file items
DiskFileItemFactory factory = new DiskFileItemFactory();
// Create a new file upload handler
@@ -1100,7 +1131,7 @@
parseHtmlToBookmarks(children, user, bookmarks, tagList); // if there is an under node = recursion
}
}
- if (isFolder == true) { // if we find a folder, we have to remove it
+ if (isFolder) { // if we find a folder, we have to remove it
int index = tagList.size() - 1;
if (index > -1) {
tagList.remove(index);
@@ -1166,7 +1197,7 @@
actionSearch(request, user);
} else {
WikittyProxy proxy = BowProxy.getInstance();
- Criteria criteria = null;
+ Criteria criteria;
if (!fullText.isEmpty()) {
criteria = Search.query().keyword(fullText).
eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria().
@@ -1354,7 +1385,7 @@
}
protected void actionReIndexation(HttpServletRequest request, HttpSession session, User user) {
- if ((Boolean)session.getAttribute("admin") == true) {
+ if ((Boolean) session.getAttribute("admin")) {
WikittyProxy proxy = BowProxy.getInstance();
proxy.getWikittyService().syncEngin(proxy.getSecurityToken());
}
Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -39,7 +39,7 @@
protected List<Bookmark> bookmarkList = new ArrayList<Bookmark>();
protected List<FacetTopic> suggestions = new ArrayList<FacetTopic>();
- protected String[] search = null;
+ protected String[] search;
public void findSuggestions(List<String> searchLine) {
int size = searchLine.size();
@@ -65,7 +65,7 @@
break;
}
}
- if (delete == true) {
+ if (delete) {
bookmarkList.remove(bookmark);
}
}
@@ -105,7 +105,7 @@
String srch = "";
Iterator<FacetTopic> it = suggestions.iterator();
if (search.length > 1) {
- srch = StringUtils.join(search, ' ', 0, (search.length - 1));
+ srch = StringUtils.join(search, ' ', 0, search.length - 1);
srch += " ";
}
while (it.hasNext()) {
Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 09:08:26 UTC (rev 125)
@@ -23,7 +23,6 @@
*/
package org.chorem.bow;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
Modified: trunk/src/main/resources/bow.properties
===================================================================
--- trunk/src/main/resources/bow.properties 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/resources/bow.properties 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+###
+# #%L
+# bow
+#
+# $Id$
+# $HeadURL$
+# %%
+# Copyright (C) 2010 CodeLutin
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
application.version=${project.version}
bow.url=http://localhost:8080/bow/
alias.url=http://localhost:8080/bow/
Modified: trunk/src/main/resources/log4j.properties
===================================================================
--- trunk/src/main/resources/log4j.properties 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/resources/log4j.properties 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+###
+# #%L
+# bow
+#
+# $Id$
+# $HeadURL$
+# %%
+# Copyright (C) 2010 CodeLutin
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
# Global logging configuration
log4j.rootLogger=WARN, stdout
Modified: trunk/src/main/resources/wikitty-jdbc-config.properties
===================================================================
--- trunk/src/main/resources/wikitty-jdbc-config.properties 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/resources/wikitty-jdbc-config.properties 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+###
+# #%L
+# bow
+#
+# $Id$
+# $HeadURL$
+# %%
+# Copyright (C) 2010 CodeLutin
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
#Connection parameters
jdbc.con.driver=org.h2.Driver
jdbc.con.host=jdbc:h2:file:~/.bow/localdb/localdb
Modified: trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/WEB-INF/web.xml 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,4 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
+
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd">
@@ -36,4 +60,4 @@
<url-pattern>/alias/*</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: trunk/src/main/webapp/admin.jsp
===================================================================
--- trunk/src/main/webapp/admin.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/admin.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.Preference" %>
<%@page import="org.chorem.bow.User" %>
@@ -7,10 +30,10 @@
Preference preference = (Preference) session.getAttribute("preference");
TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
Boolean admin = (Boolean) session.getAttribute("admin");
-if (user != null && preference != null && tokenActions != null && admin == true) {
- String url = (String) request.getAttribute("bowUrl");
- String version = (String) request.getAttribute("version");
- String permanentToken = tokenActions.getPermanentToken();
+if (user != null && preference != null && tokenActions != null && admin) {
+// String url = (String) request.getAttribute("bowUrl");
+// String version = (String) request.getAttribute("version");
+// String permanentToken = tokenActions.getPermanentToken();
String check = preference.getColors();
if (check == null) {
preference.setColors("");
@@ -39,4 +62,4 @@
</div>
</div>
<jsp:include page="footer.jsp" flush="true" />
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/src/main/webapp/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/bookmark.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/bookmark.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.BowConfig" %>
<%@page import="org.chorem.bow.Bookmark" %>
Modified: trunk/src/main/webapp/bookmarkTop.jsp
===================================================================
--- trunk/src/main/webapp/bookmarkTop.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/bookmarkTop.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="java.text.SimpleDateFormat" %>
@@ -79,4 +102,4 @@
nbBookmarks = preference.getBookmarks();
}
}
-%>
\ No newline at end of file
+%>
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/css/bookmark.css 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,420 +1,443 @@
-@charset "utf-8";
-/* CSS Document */
-#page{
- background-color:#9EDCF8;
- float:left;
- left:77%;
- position:relative;
- width:100%;
- margin-bottom:50px;
-}
-
-#header{
- background:#fff url('/bow/img/fondhead.jpg') repeat-x 0 0;
- float:left;
- position:absolute;
- right:77%;
- top:0;
- height:100px;
- width:100%;
-}
-
-#header a.logo{
- background:transparent url('/bow/img/logobow.jpg') repeat scroll 0 0;
- display:block;
- height:100px;
- text-indent:-99999px;
- width:290px;
- float:left;
- left:8%;
- position:relative;
-}
-
-#main{
- margin-top:120px;
- float:left;
- position:relative;
- right:69%;
- width:59%;
- clear:both;
-}
-
-.content{
- width:100%;
- float:left;
- background-color:#fff;
- margin-bottom: 25px;
-}
-
-#side {
- clear:right;
- float:right;
- position:relative;
- right:73%;
- width:27%;
-}
-
-.bookmark{
- width:100%;
-}
-
-.bookmark .bookmarkhead{
- width:100%;
- height:32px;
- background-color:#bf8a9c;
- border-bottom:2px solid #9EDCF8;
- position:relative;
- clear:both;
-}
-
-.bookmark .bookmarkcontenu{
- clear:both;
- padding-top:5px;
-}
-
-.bookmark .bookmarkhead .date{
- color:#fff;
- font-size:10px;
- float:left;
- margin-top:10px;
-}
-
-.bookmark .bookmarkhead .edit{
- background:url('/bow/img/edit.jpg') no-repeat;
- width:31px;
- height:32px;
- position:absolute;
- top:0;
- right:32px;
-}
-
-.bookmark .bookmarkhead .supprim{
- background:url('/bow/img/croix.jpg') no-repeat;
- width:31px;
- height:32px;
- position:absolute;
- top:0;
- right:0;
-}
-
-.bookmark .bookmarkhead a{
- color:#FFF;
- font-weight:bold;
- font-size:14px;
- line-height:32px;
- padding-left:40px;
- background:url('/bow/img/ptit_livre.jpg') no-repeat;
- height:32px;
- display:block;
- text-decoration:none;
- float:left;
- margin-right:3%;
- margin-left:3%;
-}
-
-.bookmark .bookmarkhead .alias{
- float:left;
- margin-right:15px;
- display:block;
- background:url('/bow/img/ptit-livre.jpg') no-repeat;
-}
-
-.bookmark .screenshot{
- float:left;
- margin:5px 10px;
- width:100px;
- height:75px;
- background:url('/bow/img/livreG.jpg') no-repeat;
-}
-
-.bookmark .description{
- float:left;
- margin:5px 5px;
- color:#999999;
- font-size:12px;
- width:auto;
-}
-
-.bookmark .description h3{
- color:#88516c;
-}
-
-.bookmark .description .tags{
- color:#88516c;
- background:url('/bow/img/tag.jpg') no-repeat left center;
- font-size:12px;
- padding-left:30px;
- height:28px;
- line-height:28px;
- padding-top:10px;
-}
-
-.bookmark .click{
- background:transparent url('/bow/img/click.jpg') no-repeat scroll 0 0;
- float:right;
- height:27px;
- margin:5% 5px 5px;
- padding-top:31px;
- position:relative;
- right:0;
- width:31px;
- text-align:center;
-}
-
-.nobookmarks{
- font-size: large;
- padding-left: 5px;
-}
-
-#logout{
- float:right;
- position:relative;
- right:67%;
- width:33%;
- background:#BF8A9C url('/bow/img/moyen-livre.jpg') no-repeat scroll 7% 44%;
- height:100px;
-}
-
-#logout a.help{
- background:transparent url('/bow/img/aide.jpg') no-repeat scroll 0 0;
- display:block;
- height:34px;
- text-indent:-99999px;
- width:34px;
- margin-left:15%;
- margin-top:12%;
- float:left;
-}
-
-#logout form input{
- background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0;
- border:medium none;
- color:#9C7186;
- font-size:12px;
- font-weight:bold;
- height:27px;
- line-height:27px;
- display:block;
- text-decoration:none;
- text-align:center;
- width:72px;
- float:left;
- margin-left:25%;
- margin-top:6%;
-}
-
-#side #colonneD{
- font-size:14px;
- color:#9edcf8;
-}
-
-#colonneD{
- overflow-x: auto;
- background-color: #804561;
-}
-
-#colonneD a{
- font-size:12px;
- color:#9edcf8;
-}
-
-#colonneD ul.droite{
- padding:5% 10%;
- border-bottom:2px solid #9edcf8;
-}
-
-#colonneD ul.droite li{
- list-style:none;
- height:22px;
- font-size:100%;
-}
-
-#colonneD ul.droite li a{
- font-size:14px;
- font-weight:normal;
- text-decoration:none;
- color:#9edcf8;
-}
-
-#colonneD ul.droite li a:hover{
- text-decoration:underline;
-}
-
-#colonneD #nuage,
-#colonneD .recherche,
-#colonneD #import,
-#colonneD #add{
- padding: 4% 10%;
- border-bottom:2px solid #9edcf8;
-}
-
-#colonneD h2{
- color:#9edcf8;
- font-size:140%;
- font-weight:normal;
-}
-
-#colonneD #add form{
- clear:both;
-}
-
-#colonneD form .input{
- padding:10px 0;
-}
-
-#colonneD form input{
- height:22px;
- width:50%;
- border:none;
- height:28px;
- padding-left: 4px;
-}
-
-#colonneD #add form label{
- display:inline-block;
- padding-right:9%;
- text-align:right;
- width:10%;
-}
-
-#colonneD form input[type="submit"]{
- background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0;
- border:medium none;
- color:#9C7186;
- display:block;
- float:right;
- font-size:12px;
- font-weight:bold;
- height:28px;
- line-height:28px;
- position:relative;
- right:20%;
- text-align:center;
- text-decoration:none;
- width:25%;
-}
-
-#colonneD #nuage{
- min-height:100px;
-}
-
-.colonnebas img{
- width:86%;
- height:auto;
- display:block;
- posit:relative;
-}
-
-#import .input input{
- width: 90%;
- margin-bottom: 10px;
-}
-
-.formFrame{
- width:365px;
- height:315px;
- background:url('/bow/img/fondconnexion.jpg') no-repeat;
- position:relative;
- margin-top: 20px;
- margin-bottom: 20px;
- margin-right: 100px;
- margin-left: 100px;
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 40px;
- padding-right: 70px;
-}
-
-.formFrame h1{
- color:#804561;
- width:225px;
- position:relative;
- margin:20px auto;
-}
-
-.formFrame p{
- color:#804561;
- font-size:11px;
- font-weight:bold;
- padding:15px 0;
-}
-
-.formFrame p input[type="text"],
-.formFrame p input[type="password"]{
- width:225px;
-}
-
-.formFrame input[type="submit"]{
- float: left;
- margin-top:20px;
- background:url('/bow/img/fdboutonV.jpg') repeat-x;
- height:31px;
- line-height:31px;
- color:#FFFFFF;
- font-weight:bold;
- border:none;
- width:auto;
- padding: 2px;
-}
-
-.formFrame p a{
- position: absolute;
- color:#804561;
- left:75px;
- font-weight:bold;
- font-size: 12px;
- margin-top: 2px;
-}
-
-.formFrame #homePage,
-.formFrame #regenPermToken{
- bottom: 50px;
- left: 185px;
- font-size: 10px;
-}
-
-.formFrame p input{
- margin-bottom: 2px;
-}
-
-.deleteImport{
- width: 100%;
- height: 32px;
- border: 1px solid black;
- margin-bottom: 4px;
- padding-top:10px;
- padding-left: 15px;
-}
-
-.deleteImportPink{
- background-color: #BF8A9C;
-}
-
-.deleteImportWhite{
- background-color: white;
- margin-left: 30px;
-}
-
-.deleteImport span{
- color: blue;
- font-size: large;
-}
-
-.deleteImport .deleteImportButton{
- background: url('/bow/img/croixtr.png') no-repeat;
- width: 31px;
- height: 32px;
- float: right;
- margin-right: 15px;
- position: relative;
- top: -5px;
-}
-
-#deleteSearchResultsButton{
- background: url('/bow/img/croixtr.png') no-repeat;
- width: 31px;
- height: 32px;
- float: right;
- margin-left: 25px;
- margin-right: 11px;
-}
\ No newline at end of file
+/*
+ * #%L
+ * bow
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@charset "utf-8";
+/* CSS Document */
+#page{
+ background-color:#9EDCF8;
+ float:left;
+ left:77%;
+ position:relative;
+ width:100%;
+ margin-bottom:50px;
+}
+
+#header{
+ background:#fff url('/bow/img/fondhead.jpg') repeat-x 0 0;
+ float:left;
+ position:absolute;
+ right:77%;
+ top:0;
+ height:100px;
+ width:100%;
+}
+
+#header a.logo{
+ background:transparent url('/bow/img/logobow.jpg') repeat scroll 0 0;
+ display:block;
+ height:100px;
+ text-indent:-99999px;
+ width:290px;
+ float:left;
+ left:8%;
+ position:relative;
+}
+
+#main{
+ margin-top:120px;
+ float:left;
+ position:relative;
+ right:69%;
+ width:59%;
+ clear:both;
+}
+
+.content{
+ width:100%;
+ float:left;
+ background-color:#fff;
+ margin-bottom: 25px;
+}
+
+#side {
+ clear:right;
+ float:right;
+ position:relative;
+ right:73%;
+ width:27%;
+}
+
+.bookmark{
+ width:100%;
+}
+
+.bookmark .bookmarkhead{
+ width:100%;
+ height:32px;
+ background-color:#bf8a9c;
+ border-bottom:2px solid #9EDCF8;
+ position:relative;
+ clear:both;
+}
+
+.bookmark .bookmarkcontenu{
+ clear:both;
+ padding-top:5px;
+}
+
+.bookmark .bookmarkhead .date{
+ color:#fff;
+ font-size:10px;
+ float:left;
+ margin-top:10px;
+}
+
+.bookmark .bookmarkhead .edit{
+ background:url('/bow/img/edit.jpg') no-repeat;
+ width:31px;
+ height:32px;
+ position:absolute;
+ top:0;
+ right:32px;
+}
+
+.bookmark .bookmarkhead .supprim{
+ background:url('/bow/img/croix.jpg') no-repeat;
+ width:31px;
+ height:32px;
+ position:absolute;
+ top:0;
+ right:0;
+}
+
+.bookmark .bookmarkhead a{
+ color:#FFF;
+ font-weight:bold;
+ font-size:14px;
+ line-height:32px;
+ padding-left:40px;
+ background:url('/bow/img/ptit_livre.jpg') no-repeat;
+ height:32px;
+ display:block;
+ text-decoration:none;
+ float:left;
+ margin-right:3%;
+ margin-left:3%;
+}
+
+.bookmark .bookmarkhead .alias{
+ float:left;
+ margin-right:15px;
+ display:block;
+ background:url('/bow/img/ptit-livre.jpg') no-repeat;
+}
+
+.bookmark .screenshot{
+ float:left;
+ margin:5px 10px;
+ width:100px;
+ height:75px;
+ background:url('/bow/img/livreG.jpg') no-repeat;
+}
+
+.bookmark .description{
+ float:left;
+ margin:5px 5px;
+ color:#999999;
+ font-size:12px;
+ width:auto;
+}
+
+.bookmark .description h3{
+ color:#88516c;
+}
+
+.bookmark .description .tags{
+ color:#88516c;
+ background:url('/bow/img/tag.jpg') no-repeat left center;
+ font-size:12px;
+ padding-left:30px;
+ height:28px;
+ line-height:28px;
+ padding-top:10px;
+}
+
+.bookmark .click{
+ background:transparent url('/bow/img/click.jpg') no-repeat scroll 0 0;
+ float:right;
+ height:27px;
+ margin:5% 5px 5px;
+ padding-top:31px;
+ position:relative;
+ right:0;
+ width:31px;
+ text-align:center;
+}
+
+.nobookmarks{
+ font-size: large;
+ padding-left: 5px;
+}
+
+#logout{
+ float:right;
+ position:relative;
+ right:67%;
+ width:33%;
+ background:#BF8A9C url('/bow/img/moyen-livre.jpg') no-repeat scroll 7% 44%;
+ height:100px;
+}
+
+#logout a.help{
+ background:transparent url('/bow/img/aide.jpg') no-repeat scroll 0 0;
+ display:block;
+ height:34px;
+ text-indent:-99999px;
+ width:34px;
+ margin-left:15%;
+ margin-top:12%;
+ float:left;
+}
+
+#logout form input{
+ background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0;
+ border:medium none;
+ color:#9C7186;
+ font-size:12px;
+ font-weight:bold;
+ height:27px;
+ line-height:27px;
+ display:block;
+ text-decoration:none;
+ text-align:center;
+ width:72px;
+ float:left;
+ margin-left:25%;
+ margin-top:6%;
+}
+
+#side #colonneD{
+ font-size:14px;
+ color:#9edcf8;
+}
+
+#colonneD{
+ overflow-x: auto;
+ background-color: #804561;
+}
+
+#colonneD a{
+ font-size:12px;
+ color:#9edcf8;
+}
+
+#colonneD ul.droite{
+ padding:5% 10%;
+ border-bottom:2px solid #9edcf8;
+}
+
+#colonneD ul.droite li{
+ list-style:none;
+ height:22px;
+ font-size:100%;
+}
+
+#colonneD ul.droite li a{
+ font-size:14px;
+ font-weight:normal;
+ text-decoration:none;
+ color:#9edcf8;
+}
+
+#colonneD ul.droite li a:hover{
+ text-decoration:underline;
+}
+
+#colonneD #nuage,
+#colonneD .recherche,
+#colonneD #import,
+#colonneD #add{
+ padding: 4% 10%;
+ border-bottom:2px solid #9edcf8;
+}
+
+#colonneD h2{
+ color:#9edcf8;
+ font-size:140%;
+ font-weight:normal;
+}
+
+#colonneD #add form{
+ clear:both;
+}
+
+#colonneD form .input{
+ padding:10px 0;
+}
+
+#colonneD form input{
+ height:22px;
+ width:50%;
+ border:none;
+ height:28px;
+ padding-left: 4px;
+}
+
+#colonneD #add form label{
+ display:inline-block;
+ padding-right:9%;
+ text-align:right;
+ width:10%;
+}
+
+#colonneD form input[type="submit"]{
+ background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0;
+ border:medium none;
+ color:#9C7186;
+ display:block;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ height:28px;
+ line-height:28px;
+ position:relative;
+ right:20%;
+ text-align:center;
+ text-decoration:none;
+ width:25%;
+}
+
+#colonneD #nuage{
+ min-height:100px;
+}
+
+.colonnebas img{
+ width:86%;
+ height:auto;
+ display:block;
+ posit:relative;
+}
+
+#import .input input{
+ width: 90%;
+ margin-bottom: 10px;
+}
+
+.formFrame{
+ width:365px;
+ height:315px;
+ background:url('/bow/img/fondconnexion.jpg') no-repeat;
+ position:relative;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ margin-right: 100px;
+ margin-left: 100px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 40px;
+ padding-right: 70px;
+}
+
+.formFrame h1{
+ color:#804561;
+ width:225px;
+ position:relative;
+ margin:20px auto;
+}
+
+.formFrame p{
+ color:#804561;
+ font-size:11px;
+ font-weight:bold;
+ padding:15px 0;
+}
+
+.formFrame p input[type="text"],
+.formFrame p input[type="password"]{
+ width:225px;
+}
+
+.formFrame input[type="submit"]{
+ float: left;
+ margin-top:20px;
+ background:url('/bow/img/fdboutonV.jpg') repeat-x;
+ height:31px;
+ line-height:31px;
+ color:#FFFFFF;
+ font-weight:bold;
+ border:none;
+ width:auto;
+ padding: 2px;
+}
+
+.formFrame p a{
+ position: absolute;
+ color:#804561;
+ left:75px;
+ font-weight:bold;
+ font-size: 12px;
+ margin-top: 2px;
+}
+
+.formFrame #homePage,
+.formFrame #regenPermToken{
+ bottom: 50px;
+ left: 185px;
+ font-size: 10px;
+}
+
+.formFrame p input{
+ margin-bottom: 2px;
+}
+
+.deleteImport{
+ width: 100%;
+ height: 32px;
+ border: 1px solid black;
+ margin-bottom: 4px;
+ padding-top:10px;
+ padding-left: 15px;
+}
+
+.deleteImportPink{
+ background-color: #BF8A9C;
+}
+
+.deleteImportWhite{
+ background-color: white;
+ margin-left: 30px;
+}
+
+.deleteImport span{
+ color: blue;
+ font-size: large;
+}
+
+.deleteImport .deleteImportButton{
+ background: url('/bow/img/croixtr.png') no-repeat;
+ width: 31px;
+ height: 32px;
+ float: right;
+ margin-right: 15px;
+ position: relative;
+ top: -5px;
+}
+
+#deleteSearchResultsButton{
+ background: url('/bow/img/croixtr.png') no-repeat;
+ width: 31px;
+ height: 32px;
+ float: right;
+ margin-left: 25px;
+ margin-right: 11px;
+}
Modified: trunk/src/main/webapp/css/connexion.css
===================================================================
--- trunk/src/main/webapp/css/connexion.css 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/css/connexion.css 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,108 +1,131 @@
-@charset "utf-8";
-/* CSS Document */
-#header{
- background:#FFFFFF url('/bow/img/fondhead.jpg') repeat-x;
- width:100%;
- float:left;
- height:100px;
- clear:both;
- margin:0 auto;
- position: relative;
-}
-
-#header a.logo{
- background:url(/bow/img/logobow.jpg);
- width:290px;
- height:100px;
- text-indent:-99999px;
- display:block;
-}
-
-#main{
- width:1004px;
- margin:0 auto;
- position:relative;
- clear:both;
-}
-
-#main .menu{
- margin-top: 25px;
-}
-
-#page {
- width:100%;
- margin:0 auto;
- clear:both;
-}
-
-#content{
- width:1004px;
- position:relative;
- margin:0 auto;
- padding-top:20px;
-}
-
-#formFrame{
- width:225px;
- height:315px;
- background:url('/bow/img/fondconnexion.jpg') no-repeat;
- position:relative;
- margin:100px auto;
- padding:10px 70px;
-}
-
-#formFrame h1{
- color:#804561;
- width:225px;
- position:relative;
- margin:20px auto;
-}
-
-#formFrame form p{
- color:#804561;
- font-size:16px;
- font-weight:bold;
- padding:15px 0;
-}
-
-#formFrame form input[type="text"],
-#formFrame form input[type="password"]{
- width:225px;
-}
-
-#formFrame a{
- position: absolute;
- color:#804561;
- left:75px;
- font-weight:bold;
- font-size: 12px;
-}
-
-#formFrame #register{
- bottom:50px;
- font-size:14px;
-}
-
-#formFrame #forgotPwd{
- bottom:100px;
- font-size:9px;
-}
-
-#formFrame #homePage{
- bottom: 50px;
- left: 200px;
- font-size: 10px;
-}
-
-input[type="submit"] {
- float:right;
- margin-top:20px;
- background:url('/bow/img/fdboutonV.jpg') repeat-x;
- height:31px;
- line-height:31px;
- color:#FFFFFF;
- font-weight:bold;
- border:none;
- width:auto;
- padding: 2px;
-}
\ No newline at end of file
+/*
+ * #%L
+ * bow
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@charset "utf-8";
+/* CSS Document */
+#header{
+ background:#FFFFFF url('/bow/img/fondhead.jpg') repeat-x;
+ width:100%;
+ float:left;
+ height:100px;
+ clear:both;
+ margin:0 auto;
+ position: relative;
+}
+
+#header a.logo{
+ background:url(/bow/img/logobow.jpg);
+ width:290px;
+ height:100px;
+ text-indent:-99999px;
+ display:block;
+}
+
+#main{
+ width:1004px;
+ margin:0 auto;
+ position:relative;
+ clear:both;
+}
+
+#main .menu{
+ margin-top: 25px;
+}
+
+#page {
+ width:100%;
+ margin:0 auto;
+ clear:both;
+}
+
+#content{
+ width:1004px;
+ position:relative;
+ margin:0 auto;
+ padding-top:20px;
+}
+
+#formFrame{
+ width:225px;
+ height:315px;
+ background:url('/bow/img/fondconnexion.jpg') no-repeat;
+ position:relative;
+ margin:100px auto;
+ padding:10px 70px;
+}
+
+#formFrame h1{
+ color:#804561;
+ width:225px;
+ position:relative;
+ margin:20px auto;
+}
+
+#formFrame form p{
+ color:#804561;
+ font-size:16px;
+ font-weight:bold;
+ padding:15px 0;
+}
+
+#formFrame form input[type="text"],
+#formFrame form input[type="password"]{
+ width:225px;
+}
+
+#formFrame a{
+ position: absolute;
+ color:#804561;
+ left:75px;
+ font-weight:bold;
+ font-size: 12px;
+}
+
+#formFrame #register{
+ bottom:50px;
+ font-size:14px;
+}
+
+#formFrame #forgotPwd{
+ bottom:100px;
+ font-size:9px;
+}
+
+#formFrame #homePage{
+ bottom: 50px;
+ left: 200px;
+ font-size: 10px;
+}
+
+input[type="submit"] {
+ float:right;
+ margin-top:20px;
+ background:url('/bow/img/fdboutonV.jpg') repeat-x;
+ height:31px;
+ line-height:31px;
+ color:#FFFFFF;
+ font-weight:bold;
+ border:none;
+ width:auto;
+ padding: 2px;
+}
Modified: trunk/src/main/webapp/css/global.css
===================================================================
--- trunk/src/main/webapp/css/global.css 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/css/global.css 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+/*
+ * #%L
+ * bow
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
@charset "utf-8";
/* CSS Document */
*{
@@ -81,4 +104,4 @@
font-size:14px;
text-align:center;
line-height:50px;
-}
\ No newline at end of file
+}
Modified: trunk/src/main/webapp/error.jsp
===================================================================
--- trunk/src/main/webapp/error.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/error.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,12 +1,35 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page import="org.chorem.bow.TokenActions" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%
+<%--
String techError = (String) request.getAttribute("errorMsgTech");
-%>
+--%>
<jsp:include page="header.jsp" flush="true">
<jsp:param name="cssFile" value="connexion.css" />
</jsp:include>
<div id="main">
<jsp:include page="errorFrame.jsp" flush="true" />
</div>
-<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file
+<jsp:include page="footer.jsp" flush="true" />
Modified: trunk/src/main/webapp/errorFrame.jsp
===================================================================
--- trunk/src/main/webapp/errorFrame.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/errorFrame.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
String userError = (String) request.getAttribute("errorMsgUser");
@@ -9,4 +32,4 @@
<h2>Error</h2>
</div>
<pre class="error"><%=userError%><% if (techError != null) { %><br /><br />Detailed error :<br /><%=techError%><% } %></pre>
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/src/main/webapp/footer.jsp
===================================================================
--- trunk/src/main/webapp/footer.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/footer.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
String url = (String) request.getAttribute("bowUrl");
@@ -17,4 +40,4 @@
</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/src/main/webapp/forgotPassword.jsp
===================================================================
--- trunk/src/main/webapp/forgotPassword.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/forgotPassword.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<jsp:include page="header.jsp" flush="true">
<jsp:param name="cssFile" value="connexion.css" />
@@ -20,4 +43,4 @@
</div>
</div>
</div>
-<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file
+<jsp:include page="footer.jsp" flush="true" />
Modified: trunk/src/main/webapp/header.jsp
===================================================================
--- trunk/src/main/webapp/header.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/header.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page import="org.chorem.bow.TokenActions" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
@@ -60,4 +83,4 @@
<div id="page">
<div id="header">
<a class="logo" href="<%=url%><% if (tokenActions != null) { %>?action=home&token=<%=tokenActions.getPermanentToken()%><% } %>">bow</a>
- </div>
\ No newline at end of file
+ </div>
Modified: trunk/src/main/webapp/home.jsp
===================================================================
--- trunk/src/main/webapp/home.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/home.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="org.chorem.bow.TokenActions" %>
@@ -75,4 +98,4 @@
</div>
<jsp:include page="rightMenu.jsp" flush="true" />
<jsp:include page="footer.jsp" flush="true" />
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/src/main/webapp/login.jsp
===================================================================
--- trunk/src/main/webapp/login.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/login.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<jsp:include page="header.jsp" flush="true">
<jsp:param name="cssFile" value="connexion.css" />
@@ -23,4 +46,4 @@
</div>
</div>
</div>
-<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file
+<jsp:include page="footer.jsp" flush="true" />
Modified: trunk/src/main/webapp/permanentXml.jsp
===================================================================
--- trunk/src/main/webapp/permanentXml.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/permanentXml.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/xml" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.TokenActions" %>
@@ -21,4 +44,4 @@
<Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" />
<Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&searchLine={searchTerms}" />
<moz:SearchForm><%=url%>bow</moz:SearchForm>
-</OpenSearchDescription>
\ No newline at end of file
+</OpenSearchDescription>
Modified: trunk/src/main/webapp/preferences.jsp
===================================================================
--- trunk/src/main/webapp/preferences.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/preferences.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.Preference"%>
<%@page import="org.chorem.bow.User"%>
@@ -12,10 +35,10 @@
User user = (User) session.getAttribute("user");
Preference preference = (Preference) session.getAttribute("preference");
TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
-Boolean admin = (Boolean) session.getAttribute("admin");
-if (admin == null) {
- admin = false;
-}
+//Boolean admin = (Boolean) session.getAttribute("admin");
+//if (admin == null) {
+// admin = false;
+//}
int nbTags = 100;
if (user != null && preference != null && tokenActions != null){
@@ -24,10 +47,10 @@
nbTags = tags;
}
request.setAttribute("nbTags", nbTags);
- String url = (String) request.getAttribute("bowUrl");
- String version = (String) request.getAttribute("version");
- String temporaryToken = tokenActions.getTemporaryToken();
- String permanentToken = tokenActions.getPermanentToken();
+// String url = (String) request.getAttribute("bowUrl");
+// String version = (String) request.getAttribute("version");
+// String temporaryToken = tokenActions.getTemporaryToken();
+// String permanentToken = tokenActions.getPermanentToken();
String check = preference.getColors();
if (check == null) {
preference.setColors("");
@@ -122,4 +145,4 @@
</div>
<jsp:include page="rightMenu.jsp" flush="true" />
<jsp:include page="footer.jsp" flush="true" />
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/src/main/webapp/register.jsp
===================================================================
--- trunk/src/main/webapp/register.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/register.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<jsp:include page="header.jsp" flush="true">
<jsp:param name="cssFile" value="connexion.css" />
@@ -22,4 +45,4 @@
</div>
</div>
</div>
-<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file
+<jsp:include page="footer.jsp" flush="true" />
Modified: trunk/src/main/webapp/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/rightMenu.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/rightMenu.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="java.text.SimpleDateFormat" %>
@@ -61,7 +84,7 @@
<div id="side">
<div id="colonneD">
<ul class="droite">
- <% if (admin == true) { %>
+ <% if (admin) { %>
<li><a href="bow?action=admin">Admin</a></li>
<% } %>
<li><a href="bow?action=preferences">Preferences</a></li>
@@ -125,4 +148,4 @@
<img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" />
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/src/main/webapp/search.jsp
===================================================================
--- trunk/src/main/webapp/search.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/search.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="org.chorem.bow.TokenActions" %>
@@ -8,7 +31,7 @@
<%
TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");
-Preference preference = (Preference) session.getAttribute("preference");
+//Preference preference = (Preference) session.getAttribute("preference");
String searchLine = bookmarkActions.getSearchLine();
String fullText = bookmarkActions.getFullTextLine();
@@ -66,4 +89,4 @@
</div>
<jsp:include page="rightMenu.jsp" flush="true" />
<jsp:include page="footer.jsp" flush="true" />
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/src/main/webapp/suggestions.jsp
===================================================================
--- trunk/src/main/webapp/suggestions.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/suggestions.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.OpenSearchActions" %>
<%@page import="java.util.List" %>
@@ -18,4 +41,4 @@
}
}
}
-%>
\ No newline at end of file
+%>
Modified: trunk/src/main/webapp/tagsCloud.jsp
===================================================================
--- trunk/src/main/webapp/tagsCloud.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/tagsCloud.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="java.util.List" %>
<%@page import="org.nuiton.wikitty.FacetTopic" %>
@@ -25,4 +48,4 @@
}
}
}
-%>
\ No newline at end of file
+%>
Modified: trunk/src/main/webapp/temporaryXml.jsp
===================================================================
--- trunk/src/main/webapp/temporaryXml.jsp 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/main/webapp/temporaryXml.jsp 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
<%@page contentType="text/xml" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.TokenActions" %>
@@ -21,4 +44,4 @@
<Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" />
<Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" />
<moz:SearchForm><%=url%>bow</moz:SearchForm>
-</OpenSearchDescription>
\ No newline at end of file
+</OpenSearchDescription>
Modified: trunk/src/site/rst/developper/installation.rst
===================================================================
--- trunk/src/site/rst/developper/installation.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/developper/installation.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
============
Installation
============
@@ -7,4 +30,4 @@
- de télécharger le war à cette adresse : http://maven.chorem.org/release/org/chorem/bow
- de mettre le war dans le dossier webapps de tomcat
-Le dépot des sources est à cette adresse : http://svn.chorem.org/svn/bow/
\ No newline at end of file
+Le dépot des sources est à cette adresse : http://svn.chorem.org/svn/bow/
Modified: trunk/src/site/rst/developper/presentation.rst
===================================================================
--- trunk/src/site/rst/developper/presentation.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/developper/presentation.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
============
Presentation
============
@@ -5,4 +28,4 @@
Bow est une application J2EE. Le modèle de bow utilise wikitty. Wikitty est un
projet CodeLutin qui est un système de stockage et de recherche de type clé/valeur.
-Vous trouverez de plus amples informations à cette adresse : http://maven-site.nuiton.org/wikitty .
\ No newline at end of file
+Vous trouverez de plus amples informations à cette adresse : http://maven-site.nuiton.org/wikitty .
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/index.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
Bow
===
@@ -11,4 +34,4 @@
Ce site vous donne accès à la documentation :
- utilisateur: qui vous décrira chaque caratéristique du programme.
-- développeur: qui s'adresse aux personnes désireuses de modifier des fonctionnalités ou d'en ajouter de nouvelles.
\ No newline at end of file
+- développeur: qui s'adresse aux personnes désireuses de modifier des fonctionnalités ou d'en ajouter de nouvelles.
Modified: trunk/src/site/rst/todo.rst
===================================================================
--- trunk/src/site/rst/todo.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/todo.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
Project BOW
===========
@@ -20,4 +43,4 @@
actions:
==> The same as before
-==> The result
\ No newline at end of file
+==> The result
Modified: trunk/src/site/rst/user/alias.rst
===================================================================
--- trunk/src/site/rst/user/alias.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/user/alias.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
=====================
Utilisation des alias
=====================
@@ -16,4 +39,4 @@
Alias: monAlias
-Resultat: http://demo.chorem.org/bow/alias/monAlias
\ No newline at end of file
+Resultat: http://demo.chorem.org/bow/alias/monAlias
Modified: trunk/src/site/rst/user/importExport.rst
===================================================================
--- trunk/src/site/rst/user/importExport.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/user/importExport.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
=====================
Importion/Exportation
=====================
Modified: trunk/src/site/rst/user/openSearch.rst
===================================================================
--- trunk/src/site/rst/user/openSearch.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/user/openSearch.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
==========
OpenSearch
==========
@@ -10,4 +33,4 @@
Vous pouvez aussi effectuer une recherche mais cette fois ne pas utiliser le moteur de
recherche de bow mais celui que vous avez défini au préalable. Pour cela préfixé
-votre recherche de **":s"**.
\ No newline at end of file
+votre recherche de **":s"**.
Modified: trunk/src/site/rst/user/search.rst
===================================================================
--- trunk/src/site/rst/user/search.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/user/search.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
=========
Recherche
=========
@@ -15,4 +38,4 @@
mots clés tapés dans la barre de recherche.
Ces deux types de recherche retournent, si la recherche est vide, les marque-pages
-qui ne possèdent aucun tag.
\ No newline at end of file
+qui ne possèdent aucun tag.
Modified: trunk/src/site/rst/user/token.rst
===================================================================
--- trunk/src/site/rst/user/token.rst 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/rst/user/token.rst 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,3 +1,26 @@
+.. -
+.. * #%L
+.. * bow
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Affero General Public License as published by
+.. * the Free Software Foundation, either version 3 of the License, or
+.. * (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Public License for more details.
+.. *
+.. * You should have received a copy of the GNU Affero General Public License
+.. * along with this program. If not, see <http://www.gnu.org/licenses/>.
+.. * #L%
+.. -
=====================
Ajout de marque-pages
=====================
@@ -13,4 +36,4 @@
fenêtre apparait, complétée là et le tour est joué!
Il existe deux types de lien, un qui n'est valable que le temps d'expiration de la session
-(pratique si vous utilisez temporairement un ordinateur) et l'autre de manière permanente.
\ No newline at end of file
+(pratique si vous utilisez temporairement un ordinateur) et l'autre de manière permanente.
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2010-11-23 07:55:53 UTC (rev 124)
+++ trunk/src/site/site.xml 2010-11-23 09:08:26 UTC (rev 125)
@@ -1,4 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ bow
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
+
<project name="${project.name}">
<publishDate format="dd/MM/yyyy"/>
1
0
23 Nov '10
Author: tchemit
Date: 2010-11-23 08:55:53 +0100 (Tue, 23 Nov 2010)
New Revision: 124
Url: http://chorem.org/repositories/revision/bow/124
Log:
fix api changed from nuiton-utils + remove old license project descriptor
Removed:
trunk/src/license/project.xml
Modified:
trunk/src/main/java/org/chorem/bow/UserMigration.java
Deleted: trunk/src/license/project.xml
===================================================================
--- trunk/src/license/project.xml 2010-11-23 07:55:27 UTC (rev 123)
+++ trunk/src/license/project.xml 2010-11-23 07:55:53 UTC (rev 124)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 ">http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-…">
- <mainLicense>agpl_v3</mainLicense>
- <headers>
- <header>
- <licenseName>agpl_v3</licenseName>
- <commentStyle>java</commentStyle>
- <fileSets>
- <fileSet>
- <basedir>src/main/java</basedir>
- <includes>
- <include>main/java/**/*.java</include>
- <include>test/java/**/*.java</include>
- </includes>
- </fileSet>
- </fileSets>
- </header>
- </headers>
-</project>
Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 07:55:27 UTC (rev 123)
+++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 07:55:53 UTC (rev 124)
@@ -42,14 +42,19 @@
public class UserMigration implements WikittyExtensionMigration {
@Override
- public Wikitty migrate(WikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) {
+ public Wikitty migrate(WikittyService service,
+ WikittyTransaction transaction,
+ Wikitty wikitty,
+ WikittyExtension oldExt,
+ WikittyExtension newExt) {
String id = wikitty.getId();
String version = wikitty.getVersion();
Wikitty newWikitty = new Wikitty(id);
newWikitty.setVersion(version);
- List<WikittyExtension> extensions = new ArrayList<WikittyExtension>(wikitty.getExtensions());
+ List<WikittyExtension> extensions =
+ new ArrayList<WikittyExtension>(wikitty.getExtensions());
if (extensions.contains(oldExt)) {
extensions.remove(oldExt);
extensions.add(newExt);
@@ -63,8 +68,8 @@
String password = (String) obj;
try {
password = StringUtil.encodeMD5(password);
- } catch (NoSuchAlgorithmException ex) {
- throw new WikittyException(ex);
+ } catch (RuntimeException ex) {
+ throw new WikittyException("Could not encore password", ex);
}
obj = password;
}
1
0