From 03c0191b65c68dc6be3da0e0056bcb3cbc6e9cef Mon Sep 17 00:00:00 2001 From: Alfred Schmid <A.Schmid@ff-muenchen.de> Date: Wed, 19 Feb 2014 11:04:16 -0500 Subject: [PATCH] Added logging for empty group sync. --- build.xml | 65 +++----------------------------- 1 files changed, 7 insertions(+), 58 deletions(-) diff --git a/build.xml b/build.xml index 3e42cb9..ac4e541 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ documentation @ http://gitblit.github.io/moxie ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <property name="moxie.version" value="0.9.0" /> + <property name="moxie.version" value="0.9.1" /> <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" /> <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" /> <property name="moxie.dir" value="${user.home}/.moxie" /> @@ -247,34 +247,7 @@ </mx:webxml> <!-- Gitblit jar --> - <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true"> - <!-- Specify all web.xml servlets and filters --> - <class name="com.gitblit.GitBlit" /> - <class name="com.gitblit.Keys" /> - <class name="com.gitblit.DownloadZipFilter" /> - <class name="com.gitblit.DownloadZipServlet" /> - <class name="com.gitblit.EnforceAuthenticationFilter" /> - <class name="com.gitblit.FederationServlet" /> - <class name="com.gitblit.GitFilter" /> - <class name="com.gitblit.git.GitServlet" /> - <class name="com.gitblit.LogoServlet" /> - <class name="com.gitblit.PagesFilter" /> - <class name="com.gitblit.PagesServlet" /> - <class name="com.gitblit.RobotsTxtServlet" /> - <class name="com.gitblit.RpcFilter" /> - <class name="com.gitblit.RpcServlet" /> - <class name="com.gitblit.SyndicationFilter" /> - <class name="com.gitblit.SyndicationServlet" /> - <class name="com.gitblit.SparkleShareInviteServlet" /> - <class name="com.gitblit.wicket.GitblitWicketFilter" /> - <class name="com.gitblit.wicket.GitBlitWebApp" /> - <!-- Manually include alternative User Services --> - <class name="com.gitblit.LdapUserService" /> - <class name="com.gitblit.RedmineUserService" /> - <class name="com.gitblit.SalesforceUserService" /> - <class name="com.gitblit.WindowsUserService" /> - <class name="com.gitblit.PAMUserService" /> - </mx:genjar> + <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" /> <!-- Build the WAR file --> <mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" > @@ -306,7 +279,8 @@ <!-- generate jar by traversing the class hierarchy of the specified classes, exclude any classes in classpath jars --> <mx:genjar tag="" includeresources="false" excludeClasspathJars="true" - destfile="${project.targetDirectory}/fedclient.jar"> + destfile="${project.targetDirectory}/fedclient.jar" + excludes="**/.class,**/*.java, **/Thumbs.db, **/*.mkd, com/gitblit/wicket/**"> <mainclass name="com.gitblit.FederationClient" /> <class name="com.gitblit.Keys" /> <launcher paths="ext" /> @@ -368,34 +342,7 @@ </mx:webxml> <!-- Gitblit classes --> - <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true"> - <!-- Specify all web.xml servlets and filters --> - <class name="com.gitblit.GitBlit" /> - <class name="com.gitblit.Keys" /> - <class name="com.gitblit.DownloadZipFilter" /> - <class name="com.gitblit.DownloadZipServlet" /> - <class name="com.gitblit.EnforceAuthenticationFilter" /> - <class name="com.gitblit.FederationServlet" /> - <class name="com.gitblit.GitFilter" /> - <class name="com.gitblit.git.GitServlet" /> - <class name="com.gitblit.LogoServlet" /> - <class name="com.gitblit.PagesFilter" /> - <class name="com.gitblit.PagesServlet" /> - <class name="com.gitblit.RobotsTxtServlet" /> - <class name="com.gitblit.RpcFilter" /> - <class name="com.gitblit.RpcServlet" /> - <class name="com.gitblit.SyndicationFilter" /> - <class name="com.gitblit.SyndicationServlet" /> - <class name="com.gitblit.SparkleShareInviteServlet" /> - <class name="com.gitblit.wicket.GitblitWicketFilter" /> - <class name="com.gitblit.wicket.GitBlitWebApp" /> - <!-- Manually include alternative User Services --> - <class name="com.gitblit.LdapUserService" /> - <class name="com.gitblit.RedmineUserService" /> - <class name="com.gitblit.SalesforceUserService" /> - <class name="com.gitblit.WindowsUserService" /> - <class name="com.gitblit.PAMUserService" /> - </mx:genjar> + <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" /> <!-- Build Express Zip file --> <mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}"> @@ -1010,6 +957,8 @@ <include name="localclone.groovy" /> <include name="fogbugz.groovy" /> <include name="thebuggenie.groovy" /> + <include name="fisheye.groovy" /> + <include name="redmine-fetch.groovy" /> </fileset> </copy> </sequential> -- Gitblit v1.9.1