r1370 - in xwiki-apps/gelc/gelcv1/trunk: . gelc/src/main/web/WEB-INF gelcplugins/src/test/resources
Curriki
curriki at users.forge.objectweb.org
Sat Oct 7 17:22:36 CEST 2006
Author: curriki
Date: 2006-10-07 17:22:35 +0200 (Sat, 07 Oct 2006)
New Revision: 1370
Modified:
xwiki-apps/gelc/gelcv1/trunk/build.xml
xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/hibernate.cfg.xml
xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/xwiki.cfg
xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/test/resources/xwiki.cfg
Log:
GELC build script
Modified: xwiki-apps/gelc/gelcv1/trunk/build.xml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/build.xml 2006-10-07 15:10:30 UTC (rev 1369)
+++ xwiki-apps/gelc/gelcv1/trunk/build.xml 2006-10-07 15:22:35 UTC (rev 1370)
@@ -5,7 +5,7 @@
<property file="build.properties" />
<property name="xwiki.dir" value="${basedir}/xwiki" />
- <property name="build.dir" value="${basedir}/build/gelc" />
+ <property name="build.dir" value="${basedir}/build" />
<property name="release.dir" value="${basedir}/release" />
<property name="xwiki.lib" value="${xwiki.dir}/lib" />
<property name="lib.dir" value="${basedir}/lib" />
@@ -21,6 +21,12 @@
<property name="webapp.war" value="xwiki-gelc.war"/>
+ <property name="build.dir" value="${basedir}/build/gelc" />
+ <property name="build.test.dir" value="${basedir}/build/gelctest" />
+ <property name="test.reports.dir" value="${build.dir}/test-reports" />
+ <property name="gelcplugins.test.src.dir" value="${gelcplugins.dir}/src/test/java" />
+ <property name="gelcplugins.test.res.dir" value="${gelcplugins.dir}/src/test/resources" />
+ <property name="gelcplugins.test.jar" value="${release.dir}/gelcpluginstest.jar" />
<!-- groovy setup -->
@@ -73,7 +79,7 @@
</target>
<target name="xwiki" depends="prepare">
- <ant antfile="build.xml" target="webapp"
+ <ant antfile="build.xml" target="webapp"
dir="${xwiki.dir}" inheritAll="false">
<property name="release.dir" value="${build.dir}" />
</ant>
@@ -107,7 +113,7 @@
<pathelement location="${release.dir}/xwiki.jar" />
</classpath>
</javac>
- <jar destfile="${release.dir}/gelcplugins.jar">
+ <jar destfile="${gelcplugins.jar}">
<!-- classes -->
<fileset dir="${build.dir}/gelcplugins">
<include name="**/*.class"/>
@@ -119,6 +125,61 @@
</jar>
</target>
+
+ <target name="gelcpluginstests" depends="gelcplugins">
+ <ant antfile="build.xml" target="tests"
+ dir="${xwiki.dir}" inheritAll="false">
+ <property name="release.dir" value="${build.dir}" />
+ </ant>
+ <mkdir dir="${build.test.dir}" />
+ <javac srcdir="${gelcplugins.test.src.dir}"
+ destdir="${build.test.dir}" debug="true"
+ optimize="true" deprecation="true"
+ fork="true">
+ <classpath>
+ <fileset refid="libs.xwiki.fileset" />
+ <fileset refid="libs.gelc.fileset" />
+ <pathelement location="${release.dir}/xwiki.jar" />
+ <pathelement location="${release.dir}/gelcplugins.jar" />
+ <pathelement path="${xwiki.dir}/build/test/" />
+ </classpath>
+ </javac>
+ <jar destfile="${release.dir}/gelcpluginstest.jar">
+ <!-- classes -->
+ <fileset dir="${build.test.dir}">
+ <include name="**/*.class"/>
+ </fileset>
+ <!-- resources -->
+ </jar>
+ <copy todir="${build.test.dir}">
+ <fileset dir="${gelcplugins.test.res.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="test.client" depends="gelcpluginstests">
+ <mkdir dir="${test.reports.dir}" />
+ <junit printsummary="yes" haltonfailure="no" fork="on" maxmemory="300m">
+
+ <classpath>
+ <fileset refid="libs.xwiki.fileset" />
+ <fileset refid="libs.gelc.fileset" />
+ <pathelement location="${release.dir}/xwiki.jar" />
+ <pathelement location="${release.dir}/gelcplugins.jar" />
+ <pathelement location="${release.dir}/gelcpluginstest.jar" />
+ <pathelement path="${xwiki.dir}/build/test" />
+ <pathelement path="${build.test.dir}" />
+ </classpath>
+ <formatter type="xml" />
+
+ <batchtest todir="${test.reports.dir}">
+ <fileset dir="${gelcplugins.test.src.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="release" depends="xwiki, gelcplugins">
<mkdir dir="${release.dir}" />
<war destfile="${release.dir}/${webapp.war}" webxml="${build.dir}/web/WEB-INF/web.xml">
@@ -127,11 +188,9 @@
<exclude name="**/xwiki-*.cfg" />
</fileset>
<lib dir="${release.dir}">
- <include name="xwiki.jar"/>
<include name="gelcplugins.jar"/>
</lib>
<lib refid="libs.gelc.fileset" />
- <lib refid="libs.xwiki.fileset" />
</war>
</target>
</project>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/hibernate.cfg.xml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/hibernate.cfg.xml 2006-10-07 15:10:30 UTC (rev 1369)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/hibernate.cfg.xml 2006-10-07 15:22:35 UTC (rev 1370)
@@ -24,8 +24,8 @@
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>
-->
- <property name="connection.url">jdbc:mysql://localhost/gelc</property>
- <property name="connection.username">gelc</property>
+ <property name="connection.url">jdbc:mysql://localhost/xwiki</property>
+ <property name="connection.username">xwiki</property>
<property name="connection.password">gelc</property>
<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/xwiki.cfg
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/xwiki.cfg 2006-10-07 15:10:30 UTC (rev 1369)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc/src/main/web/WEB-INF/xwiki.cfg 2006-10-07 15:22:35 UTC (rev 1370)
@@ -20,7 +20,7 @@
xwiki.store.cache=1
xwiki.store.cache.capacity=100
xwiki.monitor=1
-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,org.gelc.xwiki.plugins.mdfw.MetaDataFrameworkPlugin
+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,org.gelc.xwiki.plugins.mdfw.MetaDataFrameworkPlugin,org.gelc.xwiki.plugins.framework.FrameworkManagerPlugin
# This parameter allows XWiki to operate in Hosting mode
# allowing to create multiple wikis having their own database
@@ -68,4 +68,4 @@
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
+xwiki.authentication.unauthorized_code=200
Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/test/resources/xwiki.cfg
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/test/resources/xwiki.cfg 2006-10-07 15:10:30 UTC (rev 1369)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/test/resources/xwiki.cfg 2006-10-07 15:22:35 UTC (rev 1370)
@@ -30,4 +30,4 @@
xwiki.section.edit=1
xwiki.plugins=com.xpn.xwiki.plugin.captcha.CaptchaPlugin
-xwiki.plugin.captcha=1
\ No newline at end of file
+xwiki.plugin.captcha=1
More information about the Xwiki-notifications
mailing list