r1184 - in xwiki/trunk: . lib src/main/java/com/xpn/xwiki/api src/main/resources src/main/web/WEB-INF src/main/web/skins/xwiki10
Sergiu Dumitriu
sdumitriu at users.forge.objectweb.org
Mon Aug 21 18:48:08 CEST 2006
Author: sdumitriu
Date: 2006-08-21 18:48:07 +0200 (Mon, 21 Aug 2006)
New Revision: 1184
Added:
xwiki/trunk/lib/velocity-tools-1.1.jar
Removed:
xwiki/trunk/lib/velocity-tools-1.2.jar
Modified:
xwiki/trunk/build.xml
xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/resources/ApplicationResources.properties
xwiki/trunk/src/main/web/WEB-INF/version.properties
xwiki/trunk/src/main/web/skins/xwiki10/login.vm
Log:
Reverting velocity-tools to version 1.1, because 1.2 deprecated ToolLoader.
Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/build.xml 2006-08-21 16:48:07 UTC (rev 1184)
@@ -101,6 +101,7 @@
jta.jar,
antlr-2.7.5.jar,
asm-1.5.3.jar,asm-util-1.5.3.jar,
+ clover-1.3.9.jar,clover.license,
commons-beanutils-1.7.0.jar,
commons-codec-1.3.jar,
commons-collections-3.2.jar,
@@ -121,7 +122,7 @@
org.suigeneris.jrcs.rcs-0.3.0.jar,
org.suigeneris.jrcs.diff-0.3.0.jar,
struts-1.2.9.jar,
- velocity-1.4.jar,velocity-tools-1.2.jar,
+ velocity-1.4.jar,velocity-tools-1.1.jar,
securityfilter-2.0.jar,
radeox.jar,
portlet-api-1.0.jar,
Added: xwiki/trunk/lib/velocity-tools-1.1.jar
===================================================================
(Binary files differ)
Property changes on: xwiki/trunk/lib/velocity-tools-1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: xwiki/trunk/lib/velocity-tools-1.2.jar
===================================================================
(Binary files differ)
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java 2006-08-21 16:48:07 UTC (rev 1184)
@@ -41,8 +41,7 @@
public XWikiUser getUser() {
if (checkProgrammingRights())
return user;
- else
- return null;
+ return null;
}
public boolean isUserInGroup(String groupName) throws XWikiException {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-21 16:48:07 UTC (rev 1184)
@@ -32,12 +32,8 @@
import com.sun.image.codec.jpeg.JPEGImageEncoder;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.util.Util;
-import com.xpn.xwiki.render.groovy.XWikiGroovyRenderer;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.meta.MetaClass;
-import com.xpn.xwiki.objects.BaseObject;
-import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.stats.api.XWikiStatsService;
import com.xpn.xwiki.stats.impl.DocumentStats;
import com.xpn.xwiki.web.Utils;
@@ -48,11 +44,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
-import java.lang.*;
import java.lang.Object;
-import groovy.lang.GroovyClassLoader;
-
public class XWiki extends Api {
private com.xpn.xwiki.XWiki xwiki;
@@ -64,8 +57,7 @@
public com.xpn.xwiki.XWiki getXWiki() {
if (checkProgrammingRights())
return xwiki;
- else
- return null;
+ return null;
}
public String getVersion() {
@@ -241,15 +233,13 @@
public List search(String wheresql) throws XWikiException {
if (checkProgrammingRights())
return xwiki.search(wheresql, context);
- else
- return null;
+ return null;
}
public List search(String wheresql, int nb, int start) throws XWikiException {
if (checkProgrammingRights())
return xwiki.search(wheresql, nb, start, context);
- else
- return null;
+ return null;
}
public List searchDocuments(String wheresql) throws XWikiException {
@@ -263,8 +253,7 @@
public List searchDocuments(String wheresql, int nb, int start, String selectColumns) throws XWikiException {
if (checkProgrammingRights())
return xwiki.getStore().searchDocumentsNames(wheresql, nb, start, selectColumns, context);
- else
- return null;
+ return null;
}
public List searchDocuments(String wheresql, boolean distinctbylanguage) throws XWikiException {
@@ -295,10 +284,7 @@
String message = (String) context.get("message");
if (message == null)
return null;
- else {
- return parseMessage(message);
- }
-
+ return parseMessage(message);
}
public String parseMessage(String id) {
@@ -450,8 +436,7 @@
if (registerRight)
return xwiki.createUser(withValidation, userRights, context);
- else
- return -1;
+ return -1;
} catch (Exception e) {
e.printStackTrace();
@@ -474,7 +459,7 @@
String baseWikiName, String description, String language, boolean failOnExist) throws XWikiException {
if (checkProgrammingRights())
return xwiki.createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, description, language, failOnExist, context);
- else return -1;
+ return -1;
}
public int validateUser(boolean withConfirmEmail) throws XWikiException {
@@ -510,43 +495,37 @@
public boolean copyDocument(String docname, String targetdocname) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyDocument(docname, targetdocname, null, null, null, false, context);
- else
- return false;
+ return false;
}
public boolean copyDocument(String docname, String targetdocname, String wikilanguage) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyDocument(docname, targetdocname, null, null, wikilanguage, false, context);
- else
- return false;
+ return false;
}
public boolean copyDocument(String docname, String sourceWiki, String targetWiki, String wikilanguage) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyDocument(docname, docname, sourceWiki, targetWiki, wikilanguage, true, context);
- else
- return false;
+ return false;
}
public boolean copyDocument(String docname, String targetdocname, String sourceWiki, String targetWiki, String wikilanguage, boolean reset) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyDocument(docname, targetdocname, sourceWiki, targetWiki, wikilanguage, reset, context);
- else
- return false;
+ return false;
}
public boolean copyDocument(String docname, String targetdocname, String sourceWiki, String targetWiki, String wikilanguage, boolean reset, boolean force) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyDocument(docname, targetdocname, sourceWiki, targetWiki, wikilanguage, reset, force, context);
- else
- return false;
+ return false;
}
public int copyWikiWeb(String web, String sourceWiki, String targetWiki, String wikiLanguage, boolean clean) throws XWikiException {
if (checkProgrammingRights())
return xwiki.copyWikiWeb(web, sourceWiki, targetWiki, wikiLanguage, clean, context);
- else
- return -1;
+ return -1;
}
public String includeTopic(String topic) throws XWikiException {
@@ -560,15 +539,13 @@
public String includeTopic(String topic, boolean pre) throws XWikiException {
if (pre)
return "{pre}" + xwiki.include(topic, context, false) + "{/pre}";
- else
- return xwiki.include(topic, context, false);
+ return xwiki.include(topic, context, false);
}
public String includeForm(String topic, boolean pre) throws XWikiException {
if (pre)
return "{pre}" + xwiki.include(topic, context, true) + "{/pre}";
- else
- return xwiki.include(topic, context, true);
+ return xwiki.include(topic, context, true);
}
public boolean hasAccessLevel(String level) {
@@ -672,15 +649,13 @@
public java.lang.Object getService(String className) throws XWikiException {
if (hasProgrammingRights())
return xwiki.getService(className);
- else
- return null;
+ return null;
}
public java.lang.Object getPortalService(String className) throws XWikiException {
if (hasProgrammingRights())
return xwiki.getPortalService(className);
- else
- return null;
+ return null;
}
public List getArrayList() {
@@ -816,8 +791,7 @@
XWikiStatsService stats = context.getWiki().getStatsService(context);
if (stats == null)
return new ArrayList();
- else
- return stats.getRecentActions(action, size, context);
+ return stats.getRecentActions(action, size, context);
}
/**
@@ -1028,17 +1002,15 @@
public Object parseGroovyFromString(String script) throws XWikiException {
if (checkProgrammingRights())
- return (Object)xwiki.parseGroovyFromString(script, context);
- else
- return "groovy_missingrights";
+ return xwiki.parseGroovyFromString(script, context);
+ return "groovy_missingrights";
}
public Object parseGroovyFromPage(String fullname) throws XWikiException {
XWikiDocument doc = xwiki.getDocument(fullname, context);
if (xwiki.getRightService().hasProgrammingRights(doc, context))
return xwiki.parseGroovyFromString(doc.getContent(),context);
- else
- return "groovy_missingrights";
+ return "groovy_missingrights";
}
public String getMacroList() {
Modified: xwiki/trunk/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-21 16:48:07 UTC (rev 1184)
@@ -460,4 +460,5 @@
editingClass=Editing class
properties=Properties
classEditorIntro=Welcome to the Class Editor
-editpageTitle=Editing $msg.get($editor) for $document.displayTitle
\ No newline at end of file
+editpageTitle=Editing $msg.get($editor) for $document.displayTitle
+remembermeonthiscomp=Remember me on this computer
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/WEB-INF/version.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-21 16:48:07 UTC (rev 1184)
@@ -1,2 +1,2 @@
-#Sun Aug 20 13:20:44 EEST 2006
-build.number=0020
+#Mon Aug 21 17:24:54 EEST 2006
+build.number=0022
Modified: xwiki/trunk/src/main/web/skins/xwiki10/login.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/login.vm 2006-08-20 10:36:25 UTC (rev 1183)
+++ xwiki/trunk/src/main/web/skins/xwiki10/login.vm 2006-08-21 16:48:07 UTC (rev 1184)
@@ -19,8 +19,12 @@
<td><input type="text" id="j_username" name="j_username" value=""/></td></tr>
<tr><th><label for="j_password">$msg.get("password"):</label></th>
<td><input type="password" id="j_password" name="j_password" value=""/></td></tr>
+#if(0 #*TODO: xwiki rememberme option*#)
<tr><td colspan="2" style="text-align: left;"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/><label for="remembermeno">$msg.get("dontrememberme")</label></td></tr>
<tr><td colspan="2" style="text-align: left;"><input id="remembermeyes" type="radio" name="j_rememberme" value="true"/><label for="remembermeyes">$msg.get("rememberme")</label></td></tr>
+#else
+<tr><td colspan="2" style="text-align: left;"><input id="rememberme" type="checkbox" name="j_rememberme"/><label for="rememberme">$msg.get("remembermeonthiscomp")</label></td></tr>
+#end
</table>
<div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
#xwikimessageboxend()
More information about the Xwiki-notifications
mailing list