Author: onkarshinde-guest Date: 2009-12-11 15:12:02 +0000 (Fri, 11 Dec 2009) New Revision: 11226
Added: trunk/cruisecontrol/debian/cruisecontrol-dashboard.links Modified: trunk/cruisecontrol/debian/README.Debian trunk/cruisecontrol/debian/control trunk/cruisecontrol/debian/patches/01_disable_components.diff trunk/cruisecontrol/debian/patches/03_build_fixes.diff trunk/cruisecontrol/debian/rules Log: make the build work with xmlrpc3 libs Modified: trunk/cruisecontrol/debian/README.Debian =================================================================== --- trunk/cruisecontrol/debian/README.Debian 2009-12-11 05:34:34 UTC (rev 11225) +++ trunk/cruisecontrol/debian/README.Debian 2009-12-11 15:12:02 UTC (rev 11226) @@ -2,9 +2,7 @@ package for various reasons. Jabber publisher - Build/Runtime dependency not available in Debian. -Origo publisher - Build/Runtime dependency not available in Debian. SourceForge Enterprise Edition publishers - Build/Runtime dependency not available in Debian. -Weblog publisher - Doesn't build with xmlrpc jar version available in Debian. X10 publisher - Build/Runtime dependency not available in Debian. Charts module in reporting package - Doesn't build with jfreechart version available in Debian. Config and Plugins module in reporting package - Build/Runtime dependency not available in Debian. Modified: trunk/cruisecontrol/debian/control =================================================================== --- trunk/cruisecontrol/debian/control 2009-12-11 05:34:34 UTC (rev 11225) +++ trunk/cruisecontrol/debian/control 2009-12-11 15:12:02 UTC (rev 11226) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshi...@ubuntu.com> Build-Depends: debhelper (>= 5), cdbs, ant, quilt, libemma-java -Build-Depends-Indep: default-jdk, ant-optional, aspectj, checkstyle, ivy, junit4, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, libjoda-time-java, libjug-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libservlet2.5-java, libspring-beans-2.5-java, libspring-webmvc-2.5-java, libtomcat6-java, libwagon-java, libxstream-java +Build-Depends-Indep: default-jdk, ant-optional, aspectj, checkstyle, ivy, junit4, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, libjoda-time-java, libjug-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libservlet2.5-java, libspring-beans-2.5-java, libspring-webmvc-2.5-java, libtomcat6-java, libwagon-java, libxmlrpc3-client-java, libxstream-java Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cruisecontrol Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cruisecontrol @@ -12,7 +12,7 @@ Package: cruisecontrol Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, ant, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjaxp1.3-java, libjaxen-java, libjdom1-java, libjetty-java, libjug-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libservlet2.5-java, libsaxon-java, libxalan2-java, libxerces2-java, libxstream-java +Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, ant, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjaxp1.3-java, libjaxen-java, libjdom1-java, libjetty-java, libjug-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libservlet2.5-java, libsaxon-java, libxalan2-java, libxerces2-java, libxmlrpc3-client-java, libxstream-java Recommends: cruisecontrol-jsp Suggests: cruisecontrol-dashboard, cruisecontrol-documentation Description: continuous integration and build tool (build loop) Added: trunk/cruisecontrol/debian/cruisecontrol-dashboard.links =================================================================== --- trunk/cruisecontrol/debian/cruisecontrol-dashboard.links (rev 0) +++ trunk/cruisecontrol/debian/cruisecontrol-dashboard.links 2009-12-11 15:12:02 UTC (rev 11226) @@ -0,0 +1,36 @@ +usr/share/cruisecontrol/lib/cruisecontrol.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/cruisecontrol.jar +usr/share/java/ant.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/ant.jar +usr/share/java/aopalliance.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/aopalliance.jar +usr/share/java/asm2.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/asm2.jar +usr/share/java/asm2-commons.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/asm2-commons.jar +usr/share/java/asm2-util.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/asm2-util.jar +usr/share/java/aspectjrt.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/aspectjrt.jar +usr/share/java/aspectjweaver.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/aspectjweaver.jar +usr/share/java/cglib.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/cglib.jar +usr/share/java/commons-beanutils.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-beanutils.jar +usr/share/java/commons-collections3.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-collections3.jar +usr/share/java/commons-digester.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-digester.jar +usr/share/java/commons-io.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-io.jar +usr/share/java/commons-lang.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-lang.jar +usr/share/java/commons-logging.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/commons-logging.jar +usr/share/java/jdom1.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/jdom1.jar +usr/share/java/joda-time.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/joda-time.jar +usr/share/java/jug-asl.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/jug-asl.jar +usr/share/java/log4j-1.2.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/log4j-1.2.jar +usr/share/java/mx4j.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/mx4j.jar +usr/share/java/mx4j-remote.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/mx4j-remote.jar +usr/share/java/mx4j-tools.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/mx4j-tools.jar +usr/share/java/spring-aop.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-aop.jar +usr/share/java/spring-beans.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-beans.jar +usr/share/java/spring-context.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-context.jar +usr/share/java/spring-core.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-core.jar +usr/share/java/spring-jmx.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-jmx.jar +usr/share/java/spring-support.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-support.jar +usr/share/java/spring-web.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-web.jar +usr/share/java/spring-webmvc.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/spring-webmvc.jar +usr/share/java/velocity.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/velocity.jar +usr/share/java/velocity-tools-view.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/velocity-tools-view.jar +usr/share/java/xercesImpl.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/xercesImpl.jar +usr/share/java/xml-apis.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/xml-apis.jar +usr/share/java/xpp3.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/xpp3.jar +usr/share/java/xstream.jar usr/share/cruisecontrol/webapps/dashboard/WEB-INF/lib/xstream.jar Modified: trunk/cruisecontrol/debian/patches/01_disable_components.diff =================================================================== --- trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-12-11 05:34:34 UTC (rev 11225) +++ trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-12-11 15:12:02 UTC (rev 11226) @@ -1,8 +1,8 @@ Index: cruisecontrol-2.8.2/main/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-26 13:59:41.000000000 +0530 -+++ cruisecontrol-2.8.2/main/build.xml 2009-11-26 14:29:20.000000000 +0530 -@@ -136,14 +136,20 @@ +--- cruisecontrol-2.8.2.orig/main/build.xml 2009-12-11 16:30:44.000000000 +0530 ++++ cruisecontrol-2.8.2/main/build.xml 2009-12-11 16:36:02.000000000 +0530 +@@ -136,14 +136,18 @@ <attribute name="classpathref" default="project.classpath" /> <element name="nested" implicit="true" optional="true" /> <sequential> @@ -17,31 +17,27 @@ - <compile-macro/> + <compile-macro> + <exclude name="**/*Jabber*.java"/> -+ <exclude name="**/*Origo*.java"/> + <exclude name="**/*Sfee*.java"/> -+ <exclude name="**/*Weblog*.java"/> + <exclude name="**/*X10*.java"/> + </compile-macro> <copy todir="${classes}"> <fileset dir="${basedir}" includes="*.properties" /> -@@ -161,6 +167,12 @@ +@@ -161,6 +165,10 @@ <target name="compile-test" depends="compile" description="Compile test code"> <compile-macro srcdir="${test}" destdir="${test.classes}"> <classpath refid="project.runtime.classpath" /> + <exclude name="**/*Jabber*.java"/> -+ <exclude name="**/*Origo*.java"/> + <exclude name="**/*Sfee*.java"/> + <exclude name="**/*SFEE*.java"/> -+ <exclude name="**/*Weblog*.java"/> + <exclude name="**/*X10*.java"/> </compile-macro> <copy todir="${test.classes}"> Index: cruisecontrol-2.8.2/reporting/jsp/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-11-26 13:59:41.000000000 +0530 -+++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-11-26 14:32:44.000000000 +0530 +--- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-12-11 16:30:44.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-12-11 16:35:47.000000000 +0530 @@ -152,19 +152,29 @@ <attribute name="classpathref" default="project.runtime.classpath" /> <element name="nested" implicit="true" optional="true" /> @@ -86,8 +82,8 @@ <lib file="../../main/dist/cruisecontrol.jar"/> Index: cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp =================================================================== ---- cruisecontrol-2.8.2.orig/reporting/jsp/webcontent/main.jsp 2009-11-26 13:59:41.000000000 +0530 -+++ cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp 2009-11-26 14:29:20.000000000 +0530 +--- cruisecontrol-2.8.2.orig/reporting/jsp/webcontent/main.jsp 2009-12-11 16:30:44.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp 2009-12-11 16:35:47.000000000 +0530 @@ -72,9 +72,9 @@ <cruisecontrol:loglink id="logs_url"/> <cruisecontrol:tab name="log" url="<%=logs_url%>" label="XML Log File" /> Modified: trunk/cruisecontrol/debian/patches/03_build_fixes.diff =================================================================== --- trunk/cruisecontrol/debian/patches/03_build_fixes.diff 2009-12-11 05:34:34 UTC (rev 11225) +++ trunk/cruisecontrol/debian/patches/03_build_fixes.diff 2009-12-11 15:12:02 UTC (rev 11226) @@ -1,7 +1,7 @@ Index: cruisecontrol-2.8.2/reporting/jsp/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-11-24 19:51:07.000000000 +0530 -+++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-11-24 19:51:07.000000000 +0530 +--- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-12-11 16:30:30.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-12-11 16:30:30.000000000 +0530 @@ -98,6 +98,7 @@ <pathelement location="${classes}"/> <pathelement location="${test.classes}"/> @@ -12,8 +12,8 @@ <target name="clean"> Index: cruisecontrol-2.8.2/reporting/dashboard/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/reporting/dashboard/build.xml 2009-11-24 19:46:08.000000000 +0530 -+++ cruisecontrol-2.8.2/reporting/dashboard/build.xml 2009-11-24 19:51:07.000000000 +0530 +--- cruisecontrol-2.8.2.orig/reporting/dashboard/build.xml 2009-12-11 16:29:36.000000000 +0530 ++++ cruisecontrol-2.8.2/reporting/dashboard/build.xml 2009-12-11 16:30:30.000000000 +0530 @@ -74,6 +74,7 @@ <path id="lib.classpath"> <fileset dir="${ccmain.dist.dir}" includes="cruisecontrol.jar" /> @@ -42,8 +42,8 @@ </target> Index: cruisecontrol-2.8.2/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/build.xml 2009-11-24 19:46:08.000000000 +0530 -+++ cruisecontrol-2.8.2/build.xml 2009-11-24 19:53:00.000000000 +0530 +--- cruisecontrol-2.8.2.orig/build.xml 2009-12-11 16:29:36.000000000 +0530 ++++ cruisecontrol-2.8.2/build.xml 2009-12-11 16:30:30.000000000 +0530 @@ -134,8 +134,8 @@ prefix="${cc.bin.zip.prefix}"/> <zipfileset dir="target/binzip" prefix="${cc.bin.zip.prefix}"/> @@ -55,3 +55,79 @@ <zipfileset dir="main/lib" includes="junit*.jar" prefix="${cc.bin.zip.prefix}/${apache.ant}/lib"/> <zipfileset dir="main/lib" includes="*.jar" prefix="${cc.bin.zip.prefix}/lib" excludes="inmemorysfee*.jar, checkstyle*, **/.svn"/> <zipfileset dir="main/lib/licenses" includes="*.txt" prefix="${cc.bin.zip.prefix}/lib/licenses"/> +Index: cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/WeblogPublisher.java +=================================================================== +--- cruisecontrol-2.8.2.orig/main/src/net/sourceforge/cruisecontrol/publishers/WeblogPublisher.java 2009-12-11 16:29:36.000000000 +0530 ++++ cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/WeblogPublisher.java 2009-12-11 16:30:30.000000000 +0530 +@@ -62,7 +62,8 @@ + import net.sourceforge.cruisecontrol.util.XMLLogHelper; + + import org.apache.log4j.Logger; +-import org.apache.xmlrpc.XmlRpcClient; ++import org.apache.xmlrpc.client.XmlRpcClient; ++import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; + import org.jdom.Element; + + /** +@@ -368,7 +369,10 @@ + content = "<title>" + subject + "</title>" + content; + Object postId = null; + try { +- XmlRpcClient xmlrpc = new XmlRpcClient(blogUrl); ++ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl(); ++ config.setServerURL(new URL(blogUrl)); ++ XmlRpcClient xmlrpc = new XmlRpcClient(); ++ xmlrpc.setConfig(config); + Vector params = new Vector(); + params.add(APP_KEY); + params.add(blogId); +@@ -397,7 +401,10 @@ + String password, String category, String subject, String content) { + Object postId = null; + try { +- XmlRpcClient xmlrpc = new XmlRpcClient(blogUrl); ++ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl(); ++ config.setServerURL(new URL(blogUrl)); ++ XmlRpcClient xmlrpc = new XmlRpcClient(); ++ xmlrpc.setConfig(config); + Vector params = new Vector(); + params.add(blogId); + params.add(username); +@@ -455,7 +462,10 @@ + String password, String category, String subject, String content) { + Object postId = null; + try { +- XmlRpcClient xmlrpc = new XmlRpcClient(blogUrl); ++ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl(); ++ config.setServerURL(new URL(blogUrl)); ++ XmlRpcClient xmlrpc = new XmlRpcClient(); ++ xmlrpc.setConfig(config); + Vector params = new Vector(); + Hashtable struct = new Hashtable(); + struct.put("username", username); +Index: cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/origo/OrigoApiClient.java +=================================================================== +--- cruisecontrol-2.8.2.orig/main/src/net/sourceforge/cruisecontrol/publishers/origo/OrigoApiClient.java 2009-12-11 16:29:36.000000000 +0530 ++++ cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/origo/OrigoApiClient.java 2009-12-11 16:30:30.000000000 +0530 +@@ -44,7 +44,8 @@ + import net.sourceforge.cruisecontrol.publishers.OrigoPublisher; + + import org.apache.log4j.Logger; +-import org.apache.xmlrpc.XmlRpcClient; ++import org.apache.xmlrpc.client.XmlRpcClient; ++import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; + import org.apache.xmlrpc.XmlRpcException; + + /** +@@ -63,7 +64,10 @@ + * @param apiUrl + */ + public OrigoApiClient(URL apiUrl) { +- client = new XmlRpcClient(apiUrl); ++ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl(); ++ config.setServerURL(apiUrl); ++ client = new XmlRpcClient(); ++ client.setConfig(config); + } + + /** Modified: trunk/cruisecontrol/debian/rules =================================================================== --- trunk/cruisecontrol/debian/rules 2009-12-11 05:34:34 UTC (rev 11225) +++ trunk/cruisecontrol/debian/rules 2009-12-11 15:12:02 UTC (rev 11226) @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-trax ant-junit antlr aspectjrt commons-beanutils commons-collections3 commons-collections commons-httpclient commons-io commons-lang commons-net commons-validator el-api-2.1 emma emma_ant fast-md5 gnumail ivy jasper jasper-el jaxen jdom1 jetty jetty-util joda-time jsp-api-2.1 jug-asl junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project maven-settings mx4j mx4j-tools oro plexus-component-api servlet-api-2.5 spring-beans spring-context spring-core spring-web spring-webmvc tomcat-juli wagon-provider-api xercesImpl xstream +DEB_JARS := ant-trax ant-junit antlr aspectjrt commons-beanutils commons-collections3 commons-collections commons-httpclient commons-io commons-lang commons-net commons-validator el-api-2.1 emma emma_ant fast-md5 gnumail ivy jasper jasper-el jaxen jdom1 jetty jetty-util joda-time jsp-api-2.1 jug-asl junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project maven-settings mx4j mx4j-tools oro plexus-component-api servlet-api-2.5 spring-beans spring-context spring-core spring-web spring-webmvc tomcat-juli wagon-provider-api xercesImpl xmlrpc-client-3.1 xmlrpc-common-3.1 xstream DEB_ANT_BUILD_TARGET := build website bin-zip DEB_ANT_ARGS := -Dtest.skip=true _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits