Author: vmassol Date: 2007-01-23 11:04:34 +0100 (Tue, 23 Jan 2007) New Revision: 1964 Added: xwiki/branches/XWIKI_1_0_BETA_3/ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/hibernate.cfg.xml xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/xwiki.cfg Removed: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/webapp/WEB- INF/hibernate.cfg.xml xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/webapp/WEB- INF/xwiki.cfg Modified: xwiki/branches/XWIKI_1_0_BETA_3/build.xml xwiki/branches/XWIKI_1_0_BETA_3/web/standard/pom.xml Log: Preparing for the 1.0 Beta 3 release. All code for 1.0 Beta 3 must now be committed on the branch as the trunk is now for the 1.0 Beta 4 release. Copied: xwiki/branches/XWIKI_1_0_BETA_3 (from rev 1962, xwiki/trunk) Modified: xwiki/branches/XWIKI_1_0_BETA_3/build.xml =================================================================== --- xwiki/trunk/build.xml 2007-01-22 15:05:44 UTC (rev 1962) +++ xwiki/branches/XWIKI_1_0_BETA_3/build.xml 2007-01-23 10:04:34 UTC (rev 1964) @@ -53,13 +53,14 @@ <property name="web.standard.src.dir" value="$ {web.standard.dir}/src" /> <property name="web.standard.main.src.dir" value="$ {web.standard.src.dir}/main" /> <property name="web.standard.webapp.main.src.dir" value="$ {web.standard.main.src.dir}/webapp" /> + <property name="web.standard.configuration.main.src.dir" value="${web.standard.main.src.dir}/configuration" /> <property name="web.exo.dir" value="${web.dir}/exo" /> <property name="web.exo.src.dir" value="${web.exo.dir}/src" /> <property name="web.exo.main.src.dir" value="$ {web.exo.src.dir}/main" /> <property name="web.exo.webapp.main.src.dir" value="$ {web.exo.main.src.dir}/webapp" /> <!-- The following line is used to read the version --> - <property file="${web.standard.webapp.main.src.dir}/WEB-INF/ xwiki.cfg" /> + <property file="${web.standard.configuration.main.src.dir}/ xwiki.cfg" /> <property name="lib.dir" value="${basedir}/lib" /> @@ -171,10 +172,9 @@ <fileset id="libs.servlet.fileset" dir="${lib.dir}" includes="servlet-api-2.4.jar" /> - <fileset id="libs.exo.fileset" dir="${lib.dir}" - includes="picocontainer-1.1.jar,exo-platform.commons-2.0.jar,exo- platform.container-2.0.jar,exo- platform.service.chart.api-2.0.jar,exo- platform.service.chart.impl-2.0.jar,exo- platform.service.common.api-2.0.jar,exo- platform.service.database.api-2.0.jar,exo- platform.service.database.impl-2.0.jar,exo- platform.service.organization.api-2.0.jar,exo- platform.service.organization.impl-2.0.jar,exo- platform.service.security.api-2.0.jar,exo- platform.service.security.impl-2.0.jar" /> + <fileset id="libs.exo.fileset" dir="${lib.dir}" + includes="picocontainer-1.1.jar,exo- platform.commons-2.0.jar,exo-platform.container-2.0.jar,exo- platform.service.chart.api-2.0.jar,exo- platform.service.chart.impl-2.0.jar,exo- platform.service.common.api-2.0.jar,exo- platform.service.database.api-2.0.jar,exo- platform.service.database.impl-2.0.jar,exo- platform.service.organization.api-2.0.jar,exo- platform.service.organization.impl-2.0.jar,exo- platform.service.security.api-2.0.jar,exo- platform.service.security.impl-2.0.jar" /> - <fileset id="libs.tests.fileset" dir="${lib.dir}" includes="cactus-1.7.2.jar,cactus- ant-1.7.2.jar,aspectjrt-1.2.1.jar,httpunit-1.6.jar,junit-4.1.jar,nekoh tml-0.9.5.jar,clover-1.3.9.jar,jmock-1.1.0RC1.jar,jmock- cglib-1.1.0RC1.jar,org.mortbay.jetty-5.1.3.jar" /> @@ -190,6 +190,14 @@ <available property="junit.available" classname="junit.framework.TestCase"/> <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter" /> + <!-- Properties used in filters below. Override them in your build.properties if you wish to change their + values. Default values are for MySQL. --> + <property name="hibernate.connection.url" value="jdbc:mysql:// localhost/xwiki"/> + <property name="hibernate.connection.username" value="xwiki"/> + <property name="hibernate.connection.password" value="xwiki"/> + <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/> + <target name="junit-check" depends="prepare" unless="junit.available"> <fail message="Cannot run test cases. Please copy lib/ build/junit-4.1.jar to ${ant.home}/lib"/> </target> @@ -268,10 +276,23 @@ </copy> <copy todir="${build.dir}/web"> - <fileset includes="**" excludes="JSTrim*.*,**/ *_src.js,**/WEB-INF/web.xml,**/WEB-INF/xwiki.cfg" + <fileset includes="**" excludes="JSTrim*.*,**/ *_src.js,**/WEB-INF/web.xml" dir="${web.standard.webapp.main.src.dir}" /> </copy> - + + <!-- Copy the configuration files and filter them to replace tokens using values defined in the + build.properties file or in this file itself if no build.properties is specified --> + <copy todir="${build.dir}/web" filtering="on"> + <filterset> + <filter token="hibernate.connection.url" value="$ {hibernate.connection.url}"/> + <filter token="hibernate.connection.username" value="${hibernate.connection.username}"/> + <filter token="hibernate.connection.password" value="${hibernate.connection.password}"/> + <filter token="hibernate.connection.driver_class" value="${hibernate.connection.driver_class}"/> + <filter token="hibernate.dialect" value="$ {hibernate.dialect}"/> + </filterset> + <fileset dir="{web.standard.configuration.main.src.dir}"/> + </copy> + <copy todir="${build.dir}/web/WEB-INF"> <fileset includes="${basedir}/LICENSE.txt" dir="${basedir}" /> @@ -495,7 +516,6 @@ <copy todir="${release.dir}/web"> <fileset dir="${build.dir}/web"> <exclude name="**/hibernate-test.cfg.xml" /> - <exclude name="**/hibernate.cfg.*.xml" /> </fileset> </copy> <copy todir="${release.dir}/web/WEB-INF/lib"> Modified: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/pom.xml =================================================================== --- xwiki/trunk/web/standard/pom.xml 2007-01-22 15:05:44 UTC (rev 1962) +++ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/pom.xml 2007-01-23 10:04:34 UTC (rev 1964) @@ -49,5 +49,63 @@ <scope>runtime</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/configuration</directory> + <filtering>true</filtering> + <targetPath>WEB-INF</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>mysql</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <hibernate.connection.url>jdbc:mysql://localhost/xwiki</ hibernate.connection.url> + <hibernate.connection.username>xwiki</ hibernate.connection.username> + <hibernate.connection.password>xwiki</ hibernate.connection.password> + <hibernate.connection.driver_class>com.mysql.jdbc.Driver</ hibernate.connection.driver_class> + <hibernate.dialect>org.hibernate.dialect.MySQLDialect</ hibernate.dialect> + </properties> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.4</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hsqldb</id> + <properties> + <hibernate.connection.url>jdbc:hsqldb:file:target/ xwiki_db;shutdown=true</hibernate.connection.url> + <hibernate.connection.username>sa</ hibernate.connection.username> + <hibernate.connection.password></ hibernate.connection.password> + <hibernate.connection.driver_class>org.hsqldb.jdbcDriver</ hibernate.connection.driver_class> + <hibernate.dialect>org.hibernate.dialect.HSQLDialect</ hibernate.dialect> + </properties> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> \ No newline at end of file Copied: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/hibernate.cfg.xml (from rev 1956, xwiki/trunk/web/ standard/src/main/webapp/WEB-INF/hibernate.cfg.xml) =================================================================== --- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/ hibernate.cfg.xml 2007-01-18 08:20:24 UTC (rev 1956) +++ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/hibernate.cfg.xml 2007-01-23 10:04:34 UTC (rev 1964) @@ -0,0 +1,36 @@ +<?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">@hibernate.connection.url@</ property> + <property name="connection.username">@hibernate.connection.username@</property> + <property name="connection.password">@hibernate.connection.password@</property> + <property name="connection.driver_class">@hibernate.connection.driver_class@</ property> + <property name="dialect">@hibernate.dialect@</property> + + <property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionPro vider</property> + <property name="connection.pool_size">2</property> + <property name="statement_cache.size">2</property> + + <!-- Mapping files --> + <mapping resource="xwiki.hbm.xml"/> + <mapping resource="feeds.hbm.xml"/> + + + </session-factory> +</hibernate-configuration> Property changes on: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/ src/main/configuration/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/xwiki.cfg (from rev 1962, xwiki/trunk/web/standard/ src/main/webapp/WEB-INF/xwiki.cfg) =================================================================== --- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg 2007-01-22 15:05:44 UTC (rev 1962) +++ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ configuration/xwiki.cfg 2007-01-23 10:04:34 UTC (rev 1964) @@ -0,0 +1,84 @@ +xwiki.version=1.0-SNAPSHOT +xwiki.base=../../ +xwiki.store.class=com.xpn.xwiki.store.XWikiHibernateStore +xwiki.store.hibernate.path=/WEB-INF/hibernate.cfg.xml +xwiki.store.hibernate.updateschema=1 +xwiki.store.hibernate.custommapping=1 + +## Jcr Store configuration +#xwiki.store.class=com.xpn.xwiki.store.jcr.XWikiJcrStore +#xwiki.store.attachment.class=com.xpn.xwiki.store.jcr.XWikiJcrAttachm entStore +#xwiki.store.versioning.class=com.xpn.xwiki.store.jcr.XWikiJcrPropert yVersioningStore +#xwiki.store.jcr.mapping=WEB-INF/classes/jcrmapping.xml +#xwiki.store.jcr.provider=com.xpn.xwiki.store.jcr.JackRabbitJCRProvid er +#xwiki.store.jcr.jackrabbit.repository.config=WEB-INF/classes/ jackrabbit/repository.xml +#xwiki.store.jcr.jackrabbit.repository.path=jackrabbitrepo +#xwiki.store.jcr.jackrabbit.nodetypes.config=WEB-INF/classes/ jackrabbit/nodetypes.cnd + +xwiki.store.cache=1 +xwiki.store.cache.capacity=100 +xwiki.monitor=1 +xwiki.plugins=com.xpn.xwiki.monitor.api.MonitorPlugin,com.xpn.xwiki.p lugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com .xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePl ugin,com.xpn.xwiki.plugin.flickr.FlickrPlugin,com.xpn.xwiki.plugin.mai l.MailPlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin,com.xpn.xwik i.plugin.query.QueryPlugin,com.xpn.xwiki.plugin.graphviz.GraphVizPlugi n,com.xpn.xwiki.plugin.svg.SVGPlugin,com.xpn.xwiki.plugin.charts.Chart ingPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwi ki.plugin.image.ImagePlugin,com.xpn.xwiki.plugin.packaging.PackagePlug in, com.xpn.xwiki.plugin.captcha.CaptchaPlugin,com.xpn.xwiki.plugin.userdi rectory.UserDirectoryPlugin,com.xpn.xwiki.plugin.usertools.XWikiUserMa nagementToolsImpl + +# This parameter allows XWiki to operate in Hosting mode +# allowing to create multiple wikis having their own database +# and responding to different URLs +xwiki.virtual=0 +xwiki.virtual.redirect=http://127.0.0.1:9080/xwiki/bin/Main/ ThisWikiDoesNotExist + +# This parameter will activate the exo integration +xwiki.exo=0 + +xwiki.authentication=form +xwiki.authentication.validationKey=totototototototototototototototo +xwiki.authentication.encryptionKey=titititititititititititititititi +xwiki.authentication.cookiedomains=xwiki.com,wiki.fr + +# Stats configuration allows to globally activate/deactivate stats module +# it is also possible to choose a different stats service to record +# statistics separately from XWiki +xwiki.stats=1 +xwiki.stats.default=1 +xwiki.stats.class=com.xpn.xwiki.stats.impl.XWikiStatsServiceImpl + +xwiki.encoding=ISO-8859-1 +xwiki.render.macromapping=1 +xwiki.backlinks=1 +xwiki.tags=1 + +xwiki.plugin.graphviz.dotpath=c:/Program Files/ATT/GraphViz/bin/ dot.exe +xwiki.plugin.graphviz.neatopath=c:/Program Files/ATT/GraphViz/bin/ neato.exe + +xwiki.plugin.laszlo.baseurl=/openlaszlo/xwiki/ +xwiki.plugin.laszlo.path=c:/Program Files/Apache Software Foundation/Tomcat 5.0/webapps/openlaszlo/xwiki/ + +xwiki.plugin.image.cache.capacity=30 + +xwiki.plugin.captcha=1 + +## Personal config + +# Enable to allow superadmin. It is disabled by default as this could be a security breach if +# it were set and you forgot about it. +#xwiki.superadminpassword=system + +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_nam e=sn,first_name=givenName,fullname=displayName,email=mail,ldap_dn=dn + +xwiki.authentication.unauthorized_code=200 + +# This parameter will activate the sectional editing +xwiki.section.edit=1 + +# Editor config +xwiki.wysiwyg.use_style_toolbar=1 + +xwiki.defaultskin=xwiki10b1 +xwiki.defaultbaseskin=xwiki10b1 Property changes on: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/ src/main/configuration/xwiki.cfg ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ webapp/WEB-INF/hibernate.cfg.xml =================================================================== --- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/ hibernate.cfg.xml 2007-01-22 15:05:44 UTC (rev 1962) +++ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/webapp/ WEB-INF/hibernate.cfg.xml 2007-01-23 10:04:34 UTC (rev 1964) @@ -1,46 +0,0 @@ -<?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> - - <!-- Uncomment if you want to use HSQLDB. - Note that the database will be created automatically if it doesn't already exist. - <property name="connection.url">jdbc:hsqldb:file:/some/path/ xwiki_db;shutdown=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> - --> - - <!-- Default MySQL configuration --> - <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.DBCPConnectionPro vider</property> - <property name="connection.pool_size">2</property> - <property name="statement_cache.size">2</property> - - <!-- Mapping files --> - <mapping resource="xwiki.hbm.xml"/> - <mapping resource="feeds.hbm.xml"/> - - - </session-factory> -</hibernate-configuration> Deleted: xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/ webapp/WEB-INF/xwiki.cfg =================================================================== --- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg 2007-01-22 15:05:44 UTC (rev 1962) +++ xwiki/branches/XWIKI_1_0_BETA_3/web/standard/src/main/webapp/ WEB-INF/xwiki.cfg 2007-01-23 10:04:34 UTC (rev 1964) @@ -1,84 +0,0 @@ -xwiki.version=1.0-SNAPSHOT -xwiki.base=../../ -xwiki.store.class=com.xpn.xwiki.store.XWikiHibernateStore -xwiki.store.hibernate.path=/WEB-INF/hibernate.cfg.xml -xwiki.store.hibernate.updateschema=1 -xwiki.store.hibernate.custommapping=1 - -## Jcr Store configuration -#xwiki.store.class=com.xpn.xwiki.store.jcr.XWikiJcrStore - #xwiki.store.attachment.class=com.xpn.xwiki.store.jcr.XWikiJcrAttachme ntStore - #xwiki.store.versioning.class=com.xpn.xwiki.store.jcr.XWikiJcrProperty VersioningStore -#xwiki.store.jcr.mapping=WEB-INF/classes/jcrmapping.xml - #xwiki.store.jcr.provider=com.xpn.xwiki.store.jcr.JackRabbitJCRProvide r -#xwiki.store.jcr.jackrabbit.repository.config=WEB-INF/classes/ jackrabbit/repository.xml -#xwiki.store.jcr.jackrabbit.repository.path=jackrabbitrepo -#xwiki.store.jcr.jackrabbit.nodetypes.config=WEB-INF/classes/ jackrabbit/nodetypes.cnd - -xwiki.store.cache=1 -xwiki.store.cache.capacity=100 -xwiki.monitor=1 - xwiki.plugins=com.xpn.xwiki.monitor.api.MonitorPlugin,com.xpn.xwiki.pl ugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com. xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePlu gin,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.Charti ngPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwik i.plugin.image.ImagePlugin,com.xpn.xwiki.plugin.packaging.PackagePlugi n, com.xpn.xwiki.plugin.captcha.CaptchaPlugin,com.xpn.xwiki.plugin.userdi rectory.UserDirectoryPlugin,com.xpn.xwiki.plugin.usertools.XWikiUserMa nagementToolsImpl - -# This parameter allows XWiki to operate in Hosting mode -# allowing to create multiple wikis having their own database -# and responding to different URLs -xwiki.virtual=0 -xwiki.virtual.redirect=http://127.0.0.1:9080/xwiki/bin/Main/ ThisWikiDoesNotExist - -# This parameter will activate the exo integration -xwiki.exo=0 - -xwiki.authentication=form -xwiki.authentication.validationKey=totototototototototototototototo -xwiki.authentication.encryptionKey=titititititititititititititititi -xwiki.authentication.cookiedomains=xwiki.com,wiki.fr - -# Stats configuration allows to globally activate/deactivate stats module -# it is also possible to choose a different stats service to record -# statistics separately from XWiki -xwiki.stats=1 -xwiki.stats.default=1 -xwiki.stats.class=com.xpn.xwiki.stats.impl.XWikiStatsServiceImpl - -xwiki.encoding=ISO-8859-1 -xwiki.render.macromapping=1 -xwiki.backlinks=1 -xwiki.tags=1 - -xwiki.plugin.graphviz.dotpath=c:/Program Files/ATT/GraphViz/bin/ dot.exe -xwiki.plugin.graphviz.neatopath=c:/Program Files/ATT/GraphViz/bin/ neato.exe - -xwiki.plugin.laszlo.baseurl=/openlaszlo/xwiki/ -xwiki.plugin.laszlo.path=c:/Program Files/Apache Software Foundation/Tomcat 5.0/webapps/openlaszlo/xwiki/ - -xwiki.plugin.image.cache.capacity=30 - -xwiki.plugin.captcha=1 - -## Personal config - -# Enable to allow superadmin. It is disabled by default as this could be a security breach if -# it were set and you forgot about it. -#xwiki.superadminpassword=system - -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 - -# This parameter will activate the sectional editing -xwiki.section.edit=1 - -# Editor config -xwiki.wysiwyg.use_style_toolbar=1 - -xwiki.defaultskin=xwiki10b1 -xwiki.defaultbaseskin=xwiki10b1 -- You receive this message as a subscriber of the xwiki- commits(a)objectweb.org mailing list. To unsubscribe: mailto:xwiki-commits-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/ wws