r1507 - in xwiki/trunk: . web/exo/src/main/webapp/WEB-INF web/standard/src/main/webapp/WEB-INF

[Vincent Massol]

Author: vmassol
Date: 2006-11-03 15:39:21 +0100 (Fri, 03 Nov 2006)
New Revision: 1507

Added:
   xwiki/trunk/web/exo/src/main/webapp/WEB-INF/xwiki.cfg
Removed:
   xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki-exo.cfg
Modified:
   xwiki/trunk/build.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Separate xwiki.cfg files for web/exo and web/standard

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-11-03 14:07:46 UTC (rev 1506)
+++ xwiki/trunk/build.xml	2006-11-03 14:39:21 UTC (rev 1507)
@@ -270,7 +270,7 @@
         </copy>
 
         <copy todir="${build.dir}/web">
-            <fileset includes="**" excludes="JSTrim*.*,**/*_src.js"
+            <fileset includes="**" excludes="JSTrim*.*,**/*_src.js,**/WEB-INF/web.xml,**/WEB-INF/xwiki.cfg"
                 dir="${web.standard.webapp.main.src.dir}" />
         </copy>
     	
@@ -470,8 +470,6 @@
       <mkdir dir="${release.dir}/web" />
       <copy todir="${release.dir}/web">
 	    <fileset dir="${build.dir}/web">
-          <exclude name="**/web-*.xml" />
-          <exclude name="**/xwiki-*.cfg" />
           <exclude name="**/hibernate-test.cfg.xml" />
           <exclude name="**/hibernate.cfg.*.xml" />
         </fileset>
@@ -482,30 +480,34 @@
         <fileset refid="libs.exo.fileset" />
         <fileset refid="libs.xwiki.fileset" />
 	  </copy>
-      <copy tofile="${release.dir}/web/WEB-INF/web.xml" overwrite="true"
-		file="${web.standard.webapp.main.src.dir}/WEB-INF/web.xml" />
+      <copy todir="${release.dir}/web" overwrite="true">
+        <fileset dir="${web.standard.webapp.main.src.dir}">
+          <include name="**/WEB-INF/web.xml"/>
+          <include name="**/WEB-INF/xwiki.cfg"/>
+        </fileset>
+      </copy>
     </target>
 
     <target name="release" depends="jar">
       <mkdir dir="${release.dir}" />
-      <war warfile="${release.warfile}" basedir="${build.dir}/web" webxml="${web.standard.webapp.main.src.dir}/WEB-INF/web.xml" >
-        <exclude name="**/web*.xml" />
-        <exclude name="**/xwiki-*.cfg" />
+      <war warfile="${release.warfile}" webxml="${web.standard.webapp.main.src.dir}/WEB-INF/web.xml" >
         <lib refid="libs.main.fileset" />
         <lib refid="libs.hib.fileset" />
         <lib refid="libs.exo.fileset" />
         <lib refid="libs.xwiki.fileset" />
+        <fileset dir="${build.dir}/web"/>
+        <fileset dir="${web.standard.webapp.main.src.dir}">
+          <include name="**/WEB-INF/xwiki.cfg"/>
+        </fileset>
       </war>
-      <copy file="${build.dir}/web/WEB-INF/xwiki.cfg" tofile="${build.dir}/web/WEB-INF/xwiki-normal.cfg" overwrite="true" />
-      <copy file="${build.dir}/web/WEB-INF/xwiki-exo.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
-      <war warfile="${exo.warfile}" basedir="${build.dir}/web" webxml="${web.exo.webapp.main.src.dir}/WEB-INF/web.xml" >
-        <exclude name="**/web*.xml" />
-        <exclude name="**/xwiki-*.cfg" />
-          <lib refid="libs.main.fileset" />
-          <lib refid="libs.xwiki.fileset" />
+      <war warfile="${exo.warfile}" webxml="${web.exo.webapp.main.src.dir}/WEB-INF/web.xml" >
+        <lib refid="libs.main.fileset" />
+        <lib refid="libs.xwiki.fileset" />
+        <fileset dir="${build.dir}/web"/>
+        <fileset dir="${web.exo.webapp.main.src.dir}">
+          <include name="**/WEB-INF/xwiki.cfg"/>
+        </fileset>
       </war>
-      <copy file="${build.dir}/web/WEB-INF/xwiki-normal.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
-
     </target>
 
     <target name="bin.dist" depends="release, test, javadoc">

Copied: xwiki/trunk/web/exo/src/main/webapp/WEB-INF/xwiki.cfg (from rev 1502, xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki-exo.cfg)

Deleted: xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki-exo.cfg
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki-exo.cfg	2006-11-03 14:07:46 UTC (rev 1506)
+++ xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki-exo.cfg	2006-11-03 14:39:21 UTC (rev 1507)
@@ -1,39 +0,0 @@
-xwiki.version=0.9
-xwiki.base=../../
-#xwiki.store.class=com.xpn.xwiki.store.XWikiRCSFileStore
-#xwiki.store.rcs.path=c:/dev/java/xwiki/src/web/rcs
-xwiki.store.class=com.xpn.xwiki.store.XWikiHibernateStore
-xwiki.store.hibernate.path=/WEB-INF/hibernate.cfg.xml
-xwiki.store.cache=1
-xwiki.store.cache.capacity=100
-xwiki.plugins=com.xpn.xwiki.plugin.calendar.CalendarPlugin
-
-xwiki.perl.active=0
-xwiki.perl.javaserverport=7890
-
-#For perl to work under IDEA you need to use this
-#commented lines. The lines commited in CVS is for ant
-xwiki.perl.perlpath=c:\\Perl\\bin\\perl.exe
-xwiki.perl.pluginspath=c:/dev/java/xwiki/src/perl
-#xwiki.perl.perlpath=perl
-#xwiki.perl.pluginspath=/WEB-INF/perl
-
-# 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
-
-# This parameter will activate the exo integration
-xwiki.exo=1
-
-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
-