r1149 - in xwiki/trunk/src: main/java/com/xpn/xwiki main/java/com/xpn/xwiki/api main/java/com/xpn/xwiki/doc main/java/com/xpn/xwiki/store main/java/com/xpn/xwiki/user/impl/xwiki main/resources main/web/WEB-INF main/web/skins/xwiki10 main/web/templates test/resources
Ludovic Dubost
ludovic at users.forge.objectweb.org
Mon Aug 14 10:38:54 CEST 2006
Author: ludovic
Date: 2006-08-14 10:38:53 +0200 (Mon, 14 Aug 2006)
New Revision: 1149
Added:
xwiki/trunk/src/main/web/skins/xwiki10/adminmore.vm
xwiki/trunk/src/main/web/skins/xwiki10/editattachments.vm
xwiki/trunk/src/main/web/skins/xwiki10/editcode.vm
xwiki/trunk/src/main/web/skins/xwiki10/edithistory.vm
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyBasicAuthenticator.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java
xwiki/trunk/src/main/resources/ApplicationResources.properties
xwiki/trunk/src/main/resources/ApplicationResources_en.properties
xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
xwiki/trunk/src/main/web/WEB-INF/hibernate.cfg.xml
xwiki/trunk/src/main/web/WEB-INF/version.properties
xwiki/trunk/src/main/web/WEB-INF/xwiki.cfg
xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm
xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm
xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm
xwiki/trunk/src/main/web/skins/xwiki10/code.vm
xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm
xwiki/trunk/src/main/web/skins/xwiki10/editmodes.vm
xwiki/trunk/src/main/web/skins/xwiki10/historyinline.vm
xwiki/trunk/src/main/web/skins/xwiki10/login.vm
xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
xwiki/trunk/src/main/web/skins/xwiki10/print.vm
xwiki/trunk/src/main/web/skins/xwiki10/screenlayout.css
xwiki/trunk/src/main/web/skins/xwiki10/view.vm
xwiki/trunk/src/main/web/skins/xwiki10/viewmodes.vm
xwiki/trunk/src/main/web/templates/stylesheets.vm
xwiki/trunk/src/main/web/templates/stylesheets2.vm
xwiki/trunk/src/test/resources/hibernate-test.cfg.xml
Log:
Modify groovy call to return text message when the rights are wrong
Added some more text matches to isAdvanced()
Make sure the document database field is set in load and save. This is needed to verify programming rights in a virtual wiki environment
Fix groovy rights in virtual wiki environment
Added email conversion function in authentication to convert email to an valid xwiki account name
Fix getServerURL to look for the first XWiki.XWikiServerClass object to find the URL (and not object 0)
Added some text resources
Updates to the XWiki 1.0 skin (new tabs in edit, view and admin modes, allow to now show attachments and comments using a velocity variables, move some tabs from view to edit mode, switched to show line numbers by default in code)
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -2852,7 +2852,7 @@
XWikiDocument doc = getDocument("XWiki.XWikiServer"
+ database.substring(0, 1).toUpperCase()
+ database.substring(1), context);
- BaseObject serverobject = doc.getObject("XWiki.XWikiServerClass", 0);
+ BaseObject serverobject = doc.getObject("XWiki.XWikiServerClass");
String server = (serverobject!=null) ? serverobject.getStringValue("server") : null;
if (server != null) {
int mode = serverobject.getIntValue("secure");
@@ -3831,5 +3831,14 @@
BaseObject newobject = (BaseObject) bclass.fromMap(map, context);
return newobject;
}
+
+ public String convertUsername(String username, XWikiContext context) {
+ if (username==null)
+ return null;
+ if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("1"))
+ return username.replaceAll("[\\.\\@]", "_");
+ else
+ return username;
+ }
}
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-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1023,17 +1023,17 @@
public Object parseGroovyFromString(String script) throws XWikiException {
if (checkProgrammingRights())
- return (Object)xwiki.parseGroovyFromString(script, context);
+ return (Object)xwiki.parseGroovyFromString(script, context);
else
- return null;
+ return "groovy_missingrights";
}
public Object parseGroovyFromPage(String fullname) throws XWikiException {
XWikiDocument doc = xwiki.getDocument(fullname, context);
if (xwiki.getRightService().hasProgrammingRights(doc, context))
- return parseGroovyFromString(doc.getContent());
+ return xwiki.parseGroovyFromString(doc.getContent(),context);
else
- return null;
+ return "groovy_missingrights";
}
public String getMacroList() {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -2549,7 +2549,7 @@
}
public boolean isAdvancedContent() {
- String[] matches = { "<%" , "#set", "#include", "<form", "<input" };
+ String[] matches = { "<%" , "#set", "#include", "#if", "<form", "<input", "<script", "<style", "public class", "/* Advanced content */", "## Advanced content" };
String content2 = content.toLowerCase();
for (int i=0;i<matches.length;i++) {
if (content2.indexOf(matches[i])!=-1)
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -260,6 +260,9 @@
else
session.update(doc);
+ // Make sure the database name is stored
+ doc.setDatabase(context.getDatabase());
+
// Remove properties planned for removal
if (doc.getObjectsToRemove().size()>0) {
for (int i=0;i<doc.getObjectsToRemove().size();i++) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyBasicAuthenticator.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyBasicAuthenticator.java 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyBasicAuthenticator.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,24 +1,24 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.user.impl.xwiki;
@@ -58,13 +58,17 @@
return false;
}
+ private static String convertUsername(String username, XWikiContext context) {
+ return context.getWiki().convertUsername(username, context);
+ }
+
public static Principal checkLogin(SecurityRequestWrapper request, HttpServletResponse response, XWikiContext context) throws Exception {
// Always verify authentication
String authorizationHeader = request.getHeader("Authorization");
HttpSession session = request.getSession();
if (authorizationHeader != null) {
String decoded = decodeBasicAuthorizationString(authorizationHeader);
- String username = parseUsername(decoded);
+ String username = convertUsername(parseUsername(decoded), context);
String password = parsePassword(decoded);
Principal principal = authenticate(username, password, context);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java 2006-08-14 08:38:53 UTC (rev 1149)
@@ -64,6 +64,11 @@
return processLogin(request, response, null);
}
+
+ private String convertUsername(String username, XWikiContext context) {
+ return context.getWiki().convertUsername(username, context);
+ }
+
/**
* Process any login information that was included in the request, if any.
* Returns true if SecurityFilter should abort further processing after the method completes (for example, if a
@@ -94,7 +99,7 @@
persistentLoginManager != null
&& persistentLoginManager.rememberingLogin(request)
) {
- String username = persistentLoginManager.getRememberedUsername(request, response);
+ String username = convertUsername(persistentLoginManager.getRememberedUsername(request, response), context);
String password = persistentLoginManager.getRememberedPassword(request, response);
Principal principal = authenticate(username, password, context);
@@ -111,7 +116,7 @@
// process login form submittal
if (request.getMatchableURL().endsWith(loginSubmitPattern)) {
- String username = request.getParameter(FORM_USERNAME);
+ String username = convertUsername(request.getParameter(FORM_USERNAME), context);
String password = request.getParameter(FORM_PASSWORD);
Principal principal = authenticate(username, password, context);
if (principal != null) {
Modified: xwiki/trunk/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-14 08:38:53 UTC (rev 1149)
@@ -41,7 +41,7 @@
preview=Preview
login=Log-in
logout=Log-out
-homepage=User Home Page
+homepage=User Profile
styles=Styles
defaultstyle=Default Style
altstyle1=Alternate Style 1
@@ -419,7 +419,7 @@
simpleedittoolbardesc=Click on a button to get a sample text
simpleedittoolbardesc2=Enter the text that you wish to format. It will be shown to be copy-pasted.\\nExample:\\n$1\\nwill become:\\n$2
notice=Notice
-myhomepage=$xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))'s homepage
+myhomepage=$xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))'s profile
changephoto=Change avatar
avatar=Avatar
Error=Error
@@ -450,3 +450,6 @@
docdata=Document data
noskin=No skin is configured
youcanclicktoedit=You can <a href="${doc.getURL("edit")}">edit this page</a> to create it.
+showlinenumbers=Show Line Numbers
+hidelinenumbers=Hide Line numbers
+print=Print
\ No newline at end of file
Modified: xwiki/trunk/src/main/resources/ApplicationResources_en.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_en.properties 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/resources/ApplicationResources_en.properties 2006-08-14 08:38:53 UTC (rev 1149)
@@ -41,7 +41,7 @@
preview=Preview
login=Log-in
logout=Log-out
-homepage=User Home Page
+homepage=User Profile
styles=Styles
defaultstyle=Default Style
altstyle1=Alternate Style 1
@@ -419,7 +419,7 @@
simpleedittoolbardesc=Click on a button to get a sample text
simpleedittoolbardesc2=Enter the text that you wish to format. It will be shown to be copy-pasted.\\nExample:\\n$1\\nwill become:\\n$2
notice=Notice
-myhomepage=$xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))'s homepage
+myhomepage=$xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))'s profile
changephoto=Change avatar
avatar=Avatar
Error=Error
@@ -450,3 +450,6 @@
docdata=Document data
noskin=No skin is configured
youcanclicktoedit=You can <a href="${doc.getURL("edit")}">edit this page</a> to create it.
+showlinenumbers=Show Line Numbers
+hidelinenumbers=Hide Line numbers
+print=Print
\ No newline at end of file
Modified: xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_fr.properties 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/resources/ApplicationResources_fr.properties 2006-08-14 08:38:53 UTC (rev 1149)
@@ -42,7 +42,7 @@
preview=Previsualiser
login=Identification
logout=Quitter la session
-homepage=Page Utilisateur
+homepage=Profil Utilisateur
styles=Styles
defaultstyle=Style par défaut
altstyle1=Style 1
@@ -265,7 +265,7 @@
simpleedittoolbardesc=Cliquez sur un boutton pour obtenir un texte d'exemple
simpleedittoolbardesc2=Entrez le texte que vous voulez formater. Il sera montré pour être copié-collé.\\nExemple:\\n$1\\ndeviendra:\\n$2
notice=Note
-myhomepage=La page de $xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))
+myhomepage=Profil de $xwiki.getDocument($context.user).display("first_name", "view", $xwiki.getDocument($context.user).getObject("XWiki.XWikiUsers", 0))
changephoto=Changer d'avatar
avatar=Avatar
Error=Erreur
@@ -296,3 +296,6 @@
docdata=Données du document
noskin=Aucune skin n'est configurée
youcanclicktoedit=Vous pouvez <a href="${doc.getURL("edit")}">editer</a> cette page pour l'ajouter.
+showlinenumbers=Afficher les numéros de lignes
+hidelinenumbers=Cacher les numéros de lignes
+print=Imprimer
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/WEB-INF/hibernate.cfg.xml
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/hibernate.cfg.xml 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/WEB-INF/hibernate.cfg.xml 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,30 +1,40 @@
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
-<session-factory>
-<property name="show_sql">false</property>
-<property name="use_outer_join">true</property>
+ <session-factory>
+ <property name="show_sql">false</property>
+ <property name="use_outer_join">true</property>
-<property name="dbcp.defaultAutoCommit">false</property>
-<property name="dbcp.maxActive">50</property>
-<property name="dbcp.maxIdle">5</property>
-<property name="dbcp.maxWait">30000</property>
-<property name="dbcp.whenExhaustedAction">1</property>
-<property name="dbcp.ps.whenExhaustedAction">1</property>
-<property name="dbcp.ps.maxActive">20</property>
-<property name="dbcp.ps.maxWait">120000</property>
-<property name="dbcp.ps.maxIdle">20</property>
+ <property name="dbcp.defaultAutoCommit">false</property>
+ <property name="dbcp.maxActive">50</property>
+ <property name="dbcp.maxIdle">5</property>
+ <property name="dbcp.maxWait">30000</property>
+ <property name="dbcp.whenExhaustedAction">1</property>
+ <property name="dbcp.ps.whenExhaustedAction">1</property>
+ <property name="dbcp.ps.maxActive">20</property>
+ <property name="dbcp.ps.maxWait">120000</property>
+ <property name="dbcp.ps.maxIdle">20</property>
-<property name="connection.url">jdbc:mysql://localhost/xwiki</property>
-<property name="connection.username">xwiki</property>
-<property name="connection.password">xwiki</property>
-<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
-<property name="connection.pool_size">50</property>
-<property name="statement_cache.size">50</property>
-<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
- <!-- Mapping files -->
-<mapping resource="xwiki.hbm.xml"/>
-</session-factory>
+ <!--
+ <property name="connection.url">jdbc:hsqldb:file:c:/dev/java/xwiki/release/xwikionjetty/db/xwiki_db;shutdown=true;ifexists=true</property>
+ <property name="connection.username">sa</property>
+ <property name="connection.password"></property>
+ <property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property name="dialect">org.hibernate.dialect.HSQLDialect</property>
+ -->
+
+ <property name="connection.url">jdbc:mysql://localhost/xwiki</property>
+ <property name="connection.username">xwiki</property>
+ <property name="connection.password">xwiki</property>
+ <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+ <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+
+ <property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
+ <property name="connection.pool_size">2</property>
+ <property name="statement_cache.size">2</property>
+ <property name="jdbc.batch_size">0</property>
+ <!-- Mapping files -->
+ <mapping resource="xwiki.hbm.xml"/>
+ </session-factory>
</hibernate-configuration>
Modified: xwiki/trunk/src/main/web/WEB-INF/version.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,2 +1,2 @@
-#Mon Feb 27 18:53:15 CST 2006
-build.number=1002
+#Sun Aug 13 17:32:11 CEST 2006
+build.number=1116
Modified: xwiki/trunk/src/main/web/WEB-INF/xwiki.cfg
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/xwiki.cfg 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/WEB-INF/xwiki.cfg 2006-08-14 08:38:53 UTC (rev 1149)
@@ -9,7 +9,7 @@
xwiki.store.cache=1
xwiki.store.cache.capacity=100
xwiki.monitor=1
-xwiki.plugins=com.xpn.xwiki.plugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com.xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePlugin,com.xpn.xwiki.plugin.flickr.FlickrPlugin,com.xpn.xwiki.plugin.mail.MailPlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin,com.xpn.xwiki.plugin.query.QueryPlugin,com.xpn.xwiki.plugin.graphviz.GraphVizPlugin,com.xpn.xwiki.plugin.svg.SVGPlugin,com.xpn.xwiki.plugin.charts.ChartingPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwiki.plugin.laszlo.LaszloPlugin,com.xpn.xwiki.plugin.image.ImagePlugin
+xwiki.plugins=com.xpn.xwiki.monitor.api.MonitorPlugin,com.xpn.xwiki.plugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com.xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePlugin,com.xpn.xwiki.plugin.flickr.FlickrPlugin,com.xpn.xwiki.plugin.mail.MailPlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin,com.xpn.xwiki.plugin.query.QueryPlugin,com.xpn.xwiki.plugin.graphviz.GraphVizPlugin,com.xpn.xwiki.plugin.svg.SVGPlugin,com.xpn.xwiki.plugin.charts.ChartingPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwiki.plugin.laszlo.LaszloPlugin,com.xpn.xwiki.plugin.image.ImagePlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin
# This parameter allows XWiki to operate in Hosting mode
# allowing to create multiple wikis having their own database
@@ -44,4 +44,17 @@
xwiki.plugin.image.cache.capacity=30
-#xwiki.superadminpassword=toto
+
+## Personal config
+xwiki.superadminpassword=toto
+xwiki.authentication.ldap=0
+xwiki.authentication.ldap.server=172.29.116.202
+xwiki.authentication.ldap.check_level=1
+xwiki.authentication.ldap.port=389
+xwiki.authentication.ldap.base_DN=dc=necf,dc=fr
+xwiki.authentication.ldap.bind_DN=cn={0},cn=Users,dc=necf,dc=fr
+xwiki.authentication.ldap.bind_pass={1}
+xwiki.authentication.ldap.UID_attr=sAMAccountName
+xwiki.authentication.ldap.fields_mapping=name=sAMAccountName,last_name=sn,first_name=givenName,fullname=displayName,email=mail,ldap_dn=dn
+
+xwiki.authentication.unauthorized_code=200
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/admin.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/admin.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -81,4 +81,4 @@
#end
</div>
#template("footer.vm")
-#template("htmlfooter.vm")
\ No newline at end of file
+#template("htmlfooter.vm")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -4,4 +4,4 @@
###
<ul class="xwikitabbar">
<li id="xwikiadminprefs"#if($editor == "prefs") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=prefs&global=1")">$msg.get("adminprefs")</a></li><li id="xwikiadminglobalrights"#if($editor == "globalrights") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=globalrights&global=1")">$msg.get("adminglobalrights")</a></li><li id="xwikiadminspacerights"#if($editor == "spacerights") class="active"#end><a href="$xwiki.getDocument("${doc.web}.WebPreferences").getURL("admin", "editor=spacerights")">$msg.get("adminspacerights")</a></li><li id="xwikiadmingroups"#if($editor == "groups") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiGroups").getURL("admin", "editor=groups")">$msg.get("admingroups")</a></li><li id="xwikiadminusers"#if($editor == "users") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiUsers").getURL("admin", "editor=users")">$msg.get("adminusers")</a></li><li id="xwikiadminskin"#if($editor == "skin") class="active"#end><a href="$xwiki.getDocument($xwiki.getXWikiPreference("skin")).getURL("admin", "editor=skin")">$msg.get("adminskin")</a></li>
-</ul>
\ No newline at end of file
+</ul>
Added: xwiki/trunk/src/main/web/skins/xwiki10/adminmore.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminmore.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminmore.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -0,0 +1,2 @@
+#set($showactions = 0)
+#includeForm("Admin.WebHome")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -3,4 +3,4 @@
###
###
<h2>$xwiki.parseMessage("viewattachmentstitle")</h2>
-#template("attachmentsinline.vm")
\ No newline at end of file
+#template("attachmentsinline.vm")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -7,6 +7,7 @@
## #set($showattachments = $xwiki.getWebPreference("showattachments"))
## #end
## #if($showattachments!="no")
+#set($showactions = 0)
#set($attachments = $doc.attachmentList)
#set($counter = 0)
<div id="attachmentscontent" class="xwikiintracontent">
@@ -72,4 +73,4 @@
</script>
#end
</div>
-## #end
\ No newline at end of file
+## #end
Modified: xwiki/trunk/src/main/web/skins/xwiki10/code.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/code.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/code.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -4,15 +4,19 @@
###
<h2>$xwiki.parseMessage("viewcodetitle")</h2>
#set($ln = $request.getParameter("showlinenumbers"))
-#if($ln && $ln == "1")
-<a href="$doc.getURL("view", "showlinenumbers=0&$docvariant")">$msg.get("hidelinenumbers")</a>
+#if((!$ln) || ($ln == "1"))
+<a href="$doc.getURL("view", "viewer=code&showlinenumbers=0&$docvariant")">$msg.get("hidelinenumbers")</a>
#set($content = $tdoc.translatedContent.split("\n"))
+<br />
+<br />
<textarea readonly="readonly" style="width: 100%; height: 300px;">
#foreach($line in $content)
$velocityCount: $line
#end
</textarea>
#else
-<a href="$doc.getURL("view", "showlinenumbers=1&$docvariant")">$msg.get("showlinenumbers")</a>
+<a href="$doc.getURL("view", "viewer=code&showlinenumbers=1&$docvariant")">$msg.get("showlinenumbers")</a>
+<br />
+<br />
<textarea readonly="readonly" style="width: 100%; height: 300px;">$tdoc.translatedContent</textarea>
#end
Modified: xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -2,6 +2,7 @@
### @deprecated
###
###
+#if((!$showactions)||($showactions==1))
<script type="text/javascript">
function checkDocumentContent() {
if (document.forms.${formname}.content) {
@@ -19,4 +20,5 @@
<a href="$doc.getURL("cancel")"><button class="button" value="cancel">$msg.get("cancel")</button></a>
<button class="button" type="submit" value="preview" onclick="document.forms.${formname}.action='$doc.getURL("preview")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();if (checkDocumentContent()) document.forms.${formname}.submit(); return false;">$msg.get("preview")</button>
<button class="button" type="submit" value="save" onclick="document.forms.${formname}.action='$doc.getURL("${saveaction}")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();if (checkDocumentContent()) document.forms.${formname}.submit(); return false;" >$msg.get("save")</button>
-</div>
\ No newline at end of file
+</div>
+#end
Added: xwiki/trunk/src/main/web/skins/xwiki10/editattachments.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editattachments.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editattachments.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -0,0 +1,6 @@
+###
+### Attachments page in the "view" mode
+###
+###
+<h2>$xwiki.parseMessage("viewattachmentstitle")</h2>
+#template("attachmentsinline.vm")
Added: xwiki/trunk/src/main/web/skins/xwiki10/editcode.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editcode.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editcode.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -0,0 +1,2 @@
+#set($showactions = 0)
+#template("code.vm")
Added: xwiki/trunk/src/main/web/skins/xwiki10/edithistory.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/edithistory.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/edithistory.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -0,0 +1 @@
+#template("history.vm")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/editmodes.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editmodes.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editmodes.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -3,5 +3,5 @@
###
###
<ul class="xwikitabbar">
-<li id="xwikieditwiki"#if($editor == "wiki") class="active"#end><a href="$doc.getURL("edit", "editor=wiki")" onclick="document.forms.edit.action='$doc.getURL("edit", "editor=wiki&$languageparams")';if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;">$msg.get("editwiki")</a></li><li id="xwikieditwysiwyg"#if($editor == "wysiwyg") class="active"#end><a href="$doc.getURL("edit", "editor=wysiwyg")" onclick="document.forms.edit.action='$doc.getURL("edit", "editor=wysiwyg&$languageparams")';if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;">$msg.get("editvisual")</a></li><li id="xwikieditobject"#if($editor == "object") class="active"#end><a href="$doc.getURL("edit", "editor=object")">$msg.get("editobject")</a></li><li id="xwikieditclass"#if($editor == "class") class="active"#end><a href="$doc.getURL("edit", "editor=class")">$msg.get("editclass")</a></li><li id="xwikieditrights"#if($editor == "rights") class="active"#end><a href="$doc.getURL("edit", "editor=rights")">$msg.get("editrights")</a></li>
-</ul>
\ No newline at end of file
+<li id="xwikieditview"><a href="$doc.getURL("view","$docvariant")">$msg.get("view")</a></li><li id="xwikieditwiki"#if($editor == "wiki") class="active"#end><a href="$doc.getURL("edit", "editor=wiki")" onclick="document.forms.edit.action='$doc.getURL("edit", "editor=wiki&$languageparams")';if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;">$msg.get("editwiki")</a></li><li id="xwikieditwysiwyg"#if($editor == "wysiwyg") class="active"#end><a href="$doc.getURL("edit", "editor=wysiwyg")" onclick="document.forms.edit.action='$doc.getURL("edit", "editor=wysiwyg&$languageparams")';if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;">$msg.get("editvisual")</a></li><li id="xwikiviewattachments"#if($viewer == "attachments") class="active"#end><a href="$doc.getURL("view", "viewer=attachments&$docvariant")">$msg.get("viewattachments")</a></li><li id="xwikieditobject"#if($editor == "object") class="active"#end><a href="$doc.getURL("edit", "editor=object")">$msg.get("editobject")</a></li><li id="xwikieditclass"#if($editor == "class") class="active"#end><a href="$doc.getURL("edit", "editor=class")">$msg.get("editclass")</a></li><li id="xwikieditrights"#if($editor == "rights") class="active"#end><a href="$doc.getURL("edit", "editor=rights")">$msg.get("editrights")</a></li><li id="xwikiedithistory"#if($editor == "history") class="active"#end><a href="$doc.getURL("edit", "editor=history&$docvariant")">$msg.get("viewhistory")</a></li><li id="xwikieditcode#if($editor == "code") class="active"#end><a href="$doc.getURL("edit", "editor=code&$docvariant")">$msg.get("viewcode")</a></li>
+</ul>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/historyinline.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/historyinline.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/historyinline.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,4 +1,5 @@
- <div id="historycontent" class="xwikiintracontent">
+#set($showactions = 0)
+<div id="historycontent" class="xwikiintracontent">
<h4 class="xwikiintratitle">$msg.get("history")</h4>
<form action="$doc.getURL("view")" method="post">
<div>
@@ -46,8 +47,8 @@
</tr>
#end
</table>
- <div class="buttons"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/><input type="button" accesskey="a" value="$msg.get("allchanges")" onclick="location='$doc.getURL("view","xpage=changesall")'" class="button"/></div>
+ <div class="buttons"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div>
</div>
</div>
</form>
- </div>
\ No newline at end of file
+ </div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/login.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/login.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/login.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -3,6 +3,7 @@
###
###
#template("startpage.vm")
+<div class="main layoutsubsection">
<form id="loginForm" action="" method="post">
<input type="hidden" name="xredirect" value="$!request.getParameter("xredirect")" />
#xwikimessageboxstart($msg.get("login") "")
@@ -20,4 +21,5 @@
<div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
#xwikimessageboxend()
</form>
-#template("endpage.vm")
\ No newline at end of file
+</div>
+#template("endpage.vm")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/macros.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/macros.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -217,20 +217,20 @@
#end
#macro(xwikimessageboxfield $fielddoc $fieldname $fieldtext $html)
-<label class="field">$fieldtext</label>
-<span class="field">
+<div class="xmblabel">$fieldtext</div>
+<div class="xmbfield">
#if($fieldname!="")
$fielddoc.display($fieldname, "edit")
#end
#if($html!="")
$html
#end
-</span>
+</div>
#end
#macro(xwikimessageboxsubmit $submittext)
-<div class="button">
-<input class="button" type="submit" value="$submittext" />
+<div class="xmbbutton">
+<input type="submit" value="$submittext" />
</div>
#end
@@ -246,4 +246,4 @@
#if($objcolor && $objcolor != "")
$csspropname: $objcolor !important;
#end
-#end
\ No newline at end of file
+#end
Modified: xwiki/trunk/src/main/web/skins/xwiki10/print.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/print.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/print.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,21 +1,25 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("printheader.vm")
-<div id="xwikicontent">
-$cdoc.getRenderedContent()
-</div>
-#if ($request.get("comments")=="1")
-#template("comments2.vm")
+#template("xwikivars.vm")
+#template("layoutvars.vm")
+#template("htmlheader.vm")
+<div id="headerglobal" class="layoutsection">
+ <div id="companylogo">
+ <a href="$xwiki.getURL("Main.WebHome", "view")" title="Home">
+#set($logo = $!prefdoc.getAttachment("logo"))
+#if(!$logo)
+#set($logourl = $xwiki.getSkinFile("logo.gif"))
+ <img src="$logourl" alt="Netcipia" style="width: 215px;height: 74px;"/>
+#else
+#set($logourl = $prefdoc.getAttachmentURL($logo.filename, "download"))
+ <img src="$logourl" alt="XWiki"/>
#end
-#if ($request.get("attachments")=="1")
-<div id="xwikiattachments">
-#foreach ($attach in $doc.attachmentList)
-#if ($attach.isImage())
-<img src="$doc.getAttachmentURL("${attach.filename}", "download")" alt="${attach.filename}" />
-<br />
-#end
-#end
+ </a>
+ </div>
</div>
-#end
-#template("basefooter.vm")
-#template("footer.vm")
+<div id="xwikicontent-header">
+<div class="leftcorner"></div>
+</div>
+<div id="contentcontainer" class="layoutsection">
+ <div id="contentcolumn" class="contenthidelefthideright">
+#template("contentview.vm")
+<div class="clearfloats"></div>
+#template("endpage.vm")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/screenlayout.css
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/screenlayout.css 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/screenlayout.css 2006-08-14 08:38:53 UTC (rev 1149)
@@ -132,7 +132,6 @@
#editcolumn{
margin: 0px;
float: left;
- width: 634px;
overflow: auto;
}
@@ -140,8 +139,8 @@
position: relative;
left: 0px;
}
-#xwikidoccontent textarea{
- width: 634px;
+#xwikidoccontent textarea {
+ width: 95%;
}
html > body #xwikidoccontent textarea{
width: 630px;
@@ -206,7 +205,7 @@
padding-top: 8px;
}
-fieldset.xwikimessage legend{
+fieldset.xwikimessage legend {
font-weight: bold;
font-size: 110%;
padding: 2px 8px;
@@ -217,10 +216,10 @@
font-weight: bold;
font-size: 110%;
}
-fieldset.xwikimessage .buttons{
+fieldset.xwikimessage .buttons {
text-align: center;
}
-fieldset.xwikimessage .buttons a{
+fieldset.xwikimessage .buttons a {
text-decoration: none;
margin: 8px;
}
@@ -231,20 +230,6 @@
text-align: center;
}
-fieldset.xwikimessage label.field {
- display: block;
- float: left;
- clear: left; width: 170px;
- font-weight: bold ;
- margin-left: 30px ;
- margin-bottom: 10px;
-}
-
-fieldset.xwikimessage .field {
- display: block;
- float: left;
- margin-bottom: 10px; }
-
/*
----------------------------------------------
Comments
Modified: xwiki/trunk/src/main/web/skins/xwiki10/view.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/view.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/view.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -48,4 +48,4 @@
<div class="clearfloats"></div></div>
#end
#template("endpage.vm")
-#end
\ No newline at end of file
+#end
Modified: xwiki/trunk/src/main/web/skins/xwiki10/viewmodes.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/viewmodes.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/skins/xwiki10/viewmodes.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,3 +1,3 @@
<ul class="xwikitabbar">
-<li id="xwikiviewcode"#if($viewer == "code") class="active"#end><a href="$doc.getURL("view", "viewer=code&$docvariant")">$msg.get("viewcode")</a></li><li id="xwikiviewxml" class="extern"><a href="$doc.getURL("view", "xpage=xml&$docvariant")">$msg.get("viewxml")</a></li><li id="xwikiviewcomments"#if($viewer == "comments") class="active"#end><a href="$doc.getURL("view", "viewer=comments&$docvariant")">$msg.get("viewcomments")</a></li><li id="xwikiviewattachments"#if($viewer == "attachments") class="active"#end><a href="$doc.getURL("view", "viewer=attachments&$docvariant")">$msg.get("viewattachments")</a></li><li id="xwikiviewhistory"#if($viewer == "history") class="active"#end><a href="$doc.getURL("view", "viewer=history&$docvariant")">$msg.get("viewhistory")</a></li><li id="xwikiviewattributes"#if($viewer == "attributes") class="active"#end><a href="$doc.getURL("view", "viewer=attributes&$docvariant")">$msg.get("viewattributes")</a></li>
-</ul>
\ No newline at end of file
+<li id="xwikiviewview"><a href="$doc.getURL("view", "$docvariant")">$msg.get("view")</a></li><li id="xwikiviewcode"#if($viewer == "code") class="active"#end><a href="$doc.getURL("view", "viewer=code&$docvariant")">$msg.get("viewcode")</a></li><li id="xwikiviewprint" class="extern"><a href="$doc.getURL("print", "xpage=print&$docvariant")">$msg.get("print")</a></li><li id="xwikiviewpdf" class="extern"><a href="$doc.getURL("pdf", "$docvariant")">$msg.get("pdf")</a></li><li id="xwikiviewcomments"#if($viewer == "comments") class="active"#end><a href="$doc.getURL("view", "viewer=comments&$docvariant")">$msg.get("viewcomments")</a></li><li id="xwikiviewattachments"#if($viewer == "attachments") class="active"#end><a href="$doc.getURL("view", "viewer=attachments&$docvariant")">$msg.get("viewattachments")</a></li><li id="xwikiviewhistory"#if($viewer == "history") class="active"#end><a href="$doc.getURL("view", "viewer=history&$docvariant")">$msg.get("viewhistory")</a></li><li id="xwikiviewattributes"#if($viewer == "attributes") class="active"#end><a href="$doc.getURL("view", "viewer=attributes&$docvariant")">$msg.get("viewattributes")</a></li>
+</ul>
Modified: xwiki/trunk/src/main/web/templates/stylesheets.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/stylesheets.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/templates/stylesheets.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,10 +1,10 @@
-<link href="$xwiki.getSkinFile("style.css")" rel="stylesheet" type="text/css" />
+<link href="$xwiki.getSkinFile("style.css", true)" rel="stylesheet" type="text/css" />
#set( $defaultstyle = $xwiki.getWebPreference("stylesheet"))
#set( $stylesheets = $xwiki.getWebPreference("stylesheets"))
#if ($defaultstyle!="")
-<link href="$xwiki.getSkinFile($defaultstyle)" rel="stylesheet" type="text/css" title="default" />
+<link href="$xwiki.getSkinFile($defaultstyle, true)" rel="stylesheet" type="text/css" title="default" />
#else
-<link href="$xwiki.getSkinFile("style.css")" rel="stylesheet" type="text/css" />
+<link href="$xwiki.getSkinFile("style.css", true)" rel="stylesheet" type="text/css" />
#end
#if($request.getHeader("user-agent").indexOf("MSIE")!=-1)
<link href="$xwiki.getSkinFile("ie.css")" rel="stylesheet" type="text/css" title="default" />
@@ -12,13 +12,13 @@
#if ($stylesheets != "")
#set( $stylenb = 1)
#foreach ( $stylesheet in $xwiki.split($stylesheets, ","))
-<link href="$xwiki.getSkinFile($stylesheet)" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet $stylenb" />
+<link href="$xwiki.getSkinFile($stylesheet, true)" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet $stylenb" />
#set( $stylenb = $stylenb + 1)
#end
#else
-<link href="$xwiki.getSkinFile("style1.css")" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 1" />
-<link href="$xwiki.getSkinFile("style2.css")" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 2" />
-<link href="$xwiki.getSkinFile("style3.css")" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 3" />
+<link href="$xwiki.getSkinFile("style1.css", true)" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 1" />
+<link href="$xwiki.getSkinFile("style2.css", true)" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 2" />
+<link href="$xwiki.getSkinFile("style3.css", true)" rel="alternate stylesheet" type="text/css" title="Alternate StyleSheet 3" />
#end
<style type="text/css">
$!xwiki.getWebPreference("style")
Modified: xwiki/trunk/src/main/web/templates/stylesheets2.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/stylesheets2.vm 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/main/web/templates/stylesheets2.vm 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,13 +1,13 @@
<style type="text/css">
<!--
- @import url($xwiki.getSkinFile("style.css"));
+ @import url($xwiki.getSkinFile("style.css", true));
-->
</style>
#set( $defaultstyle = $xwiki.getWebPreference("stylesheet"))
#if ($defaultstyle!="")
<style type="text/css">
<!--
- @import url($xwiki.getSkinFile($defaultstyle));
+ @import url($xwiki.getSkinFile($defaultstyle, true));
-->
</style>
#end
Modified: xwiki/trunk/src/test/resources/hibernate-test.cfg.xml
===================================================================
--- xwiki/trunk/src/test/resources/hibernate-test.cfg.xml 2006-08-12 12:50:45 UTC (rev 1148)
+++ xwiki/trunk/src/test/resources/hibernate-test.cfg.xml 2006-08-14 08:38:53 UTC (rev 1149)
@@ -1,30 +1,39 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-<session-factory>
-<property name="show_sql">false</property>
-<property name="use_outer_join">true</property>
-
-<property name="dbcp.defaultAutoCommit">false</property>
-<property name="dbcp.maxActive">50</property>
-<property name="dbcp.maxIdle">5</property>
-<property name="dbcp.maxWait">30000</property>
-<property name="dbcp.whenExhaustedAction">1</property>
-<property name="dbcp.ps.whenExhaustedAction">1</property>
-<property name="dbcp.ps.maxActive">20</property>
-<property name="dbcp.ps.maxWait">120000</property>
-<property name="dbcp.ps.maxIdle">20</property>
-
-<property name="connection.url">jdbc:mysql://localhost/xwikitest</property>
-<property name="connection.username">xwikitest</property>
-<property name="connection.password">xwikitest</property>
-<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
-<property name="connection.pool_size">50</property>
-<property name="statement_cache.size">50</property>
-<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
- <!-- Mapping files -->
-<mapping resource="xwiki.hbm.xml"/>
-</session-factory>
-</hibernate-configuration>
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+ <session-factory>
+ <property name="show_sql">false</property>
+ <property name="use_outer_join">true</property>
+
+ <property name="dbcp.defaultAutoCommit">false</property>
+ <property name="dbcp.maxActive">50</property>
+ <property name="dbcp.maxIdle">5</property>
+ <property name="dbcp.maxWait">30000</property>
+ <property name="dbcp.whenExhaustedAction">1</property>
+ <property name="dbcp.ps.whenExhaustedAction">1</property>
+ <property name="dbcp.ps.maxActive">20</property>
+ <property name="dbcp.ps.maxWait">120000</property>
+ <property name="dbcp.ps.maxIdle">20</property>
+
+<!--
+ <property name="connection.url">jdbc:hsqldb:mem:xwikitest</property>
+ <property name="connection.username">sa</property>
+ <property name="connection.password"></property>
+ <property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property name="dialect">org.hibernate.dialect.HSQLDialect</property>
+-->
+ <property name="connection.url">jdbc:mysql://localhost/xwikitest</property>
+ <property name="connection.username">xwikitest</property>
+ <property name="connection.password">xwikitest</property>
+ <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+ <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+
+ <property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
+ <property name="connection.pool_size">2</property>
+ <property name="statement_cache.size">2</property>
+ <property name="jdbc.batch_size">0</property>
+ <!-- Mapping files -->
+ <mapping resource="xwiki.hbm.xml"/>
+ </session-factory>
+</hibernate-configuration>
More information about the Xwiki-notifications
mailing list