Author: onkarshinde-guest
Date: 2009-11-26 15:44:29 +0000 (Thu, 26 Nov 2009)
New Revision: 11129
Added:
trunk/cruisecontrol/debian/cruisecontrol-jsp.dirs
Modified:
trunk/cruisecontrol/debian/README.Debian
trunk/cruisecontrol/debian/control
trunk/cruisecontrol/debian/cruisecontrol-jsp.install
trunk/cruisecontrol/debian/cruisecontrol-jsp.links
trunk/cruisecontrol/debian/cruisecontrol.links
trunk/cruisecontrol/debian/patches/01_disable_components.diff
trunk/cruisecontrol/debian/rules
Log:
more progress on cruisecontrol
Modified: trunk/cruisecontrol/debian/README.Debian
===================================================================
--- trunk/cruisecontrol/debian/README.Debian 2009-11-26 11:50:45 UTC (rev
11128)
+++ trunk/cruisecontrol/debian/README.Debian 2009-11-26 15:44:29 UTC (rev
11129)
@@ -7,3 +7,4 @@
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-11-26 11:50:45 UTC (rev 11128)
+++ trunk/cruisecontrol/debian/control 2009-11-26 15:44:29 UTC (rev 11129)
@@ -12,27 +12,54 @@
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, libjdom1-java,
libjetty-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java,
libmx4j-java, liboro-java, libservlet2.5-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, liblog4j1.2-java,
libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java,
libservlet2.5-java, libsaxon-java, libxalan2-java, libxerces2-java,
libxstream-java
Recommends: cruisecontrol-jsp
Suggests: cruisecontrol-dashboard, cruisecontrol-documentation
-Description: place holder short description
- place holder long description
+Description: continuous integration and build tool (build loop)
+ CruiseControl is both a continuous integration tool and an extensible
+ framework for creating a custom continuous build process. It includes dozens
+ of plugins for a variety of source controls, build technologies, and
+ notifications schemes including email and instant messaging. A web interface
+ provides details of the current and previous builds.
+ .
+ This package contains the core build loop functionality.
Package: cruisecontrol-jsp
Architecture: all
-Depends: ${misc:Depends}, cruisecontrol (= ${binary:Version})
-Description: place holder short description
- place holder long description
+Depends: ${misc:Depends}, cruisecontrol (= ${binary:Version}),
libcommons-lang-java, libcommons-logging-java
+Recommends: libbatik-java
+Description: continuous integration and build tool (reporting application)
+ CruiseControl is both a continuous integration tool and an extensible
+ framework for creating a custom continuous build process. It includes dozens
+ of plugins for a variety of source controls, build technologies, and
+ notifications schemes including email and instant messaging. A web interface
+ provides details of the current and previous builds.
+ .
+ This package contains the reporting web application that allows the users to
+ browse the results of the builds and access the artifacts.
Package: cruisecontrol-dashboard
Architecture: all
Depends: ${misc:Depends}, cruisecontrol (= ${binary:Version})
-Description: place holder short description
- place holder long description
+Description: continuous integration and build tool (dashboard application)
+ CruiseControl is both a continuous integration tool and an extensible
+ framework for creating a custom continuous build process. It includes dozens
+ of plugins for a variety of source controls, build technologies, and
+ notifications schemes including email and instant messaging. A web interface
+ provides details of the current and previous builds.
+ .
+ This package contains the dashboard web application that provides a visual
+ representation of all project build statuses.
Package: cruisecontrol-documentation
Architecture: all
Depends: ${misc:Depends}
-Description: place holder short description
- place holder long description
+Description: continuous integration and build tool (documentation)
+ CruiseControl is both a continuous integration tool and an extensible
+ framework for creating a custom continuous build process. It includes dozens
+ of plugins for a variety of source controls, build technologies, and
+ notifications schemes including email and instant messaging. A web interface
+ provides details of the current and previous builds.
+ .
+ This package contains the cruisecontrol documentation in HTML format.
Added: trunk/cruisecontrol/debian/cruisecontrol-jsp.dirs
===================================================================
--- trunk/cruisecontrol/debian/cruisecontrol-jsp.dirs
(rev 0)
+++ trunk/cruisecontrol/debian/cruisecontrol-jsp.dirs 2009-11-26 15:44:29 UTC
(rev 11129)
@@ -0,0 +1 @@
+var/cache/cruisecontrol/work
Modified: trunk/cruisecontrol/debian/cruisecontrol-jsp.install
===================================================================
--- trunk/cruisecontrol/debian/cruisecontrol-jsp.install 2009-11-26
11:50:45 UTC (rev 11128)
+++ trunk/cruisecontrol/debian/cruisecontrol-jsp.install 2009-11-26
15:44:29 UTC (rev 11129)
@@ -1 +1,2 @@
-binaryrelease/JETTY-WORKDIR-README.txt
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/work/
+binaryrelease/JETTY-WORKDIR-README.txt var/cache/cruisecontrol/work/
+reporting/jsp/target/jsp-precompile/
usr/share/cruisecontrol/webapps/cruisecontrol/
Modified: trunk/cruisecontrol/debian/cruisecontrol-jsp.links
===================================================================
--- trunk/cruisecontrol/debian/cruisecontrol-jsp.links 2009-11-26 11:50:45 UTC
(rev 11128)
+++ trunk/cruisecontrol/debian/cruisecontrol-jsp.links 2009-11-26 15:44:29 UTC
(rev 11129)
@@ -1,4 +1,6 @@
+var/cache/cruisecontrol/work
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/work
usr/share/cruisecontrol/lib/cruisecontrol.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/cruisecontrol.jar
+usr/share/java/batik.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/batik.jar
usr/share/java/commons-lang.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/commons-lang.jar
usr/share/java/commons-logging.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/commons-logging.jar
usr/share/java/el-api-2.1.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/el-api-2.1.jar
@@ -7,7 +9,7 @@
usr/share/java/log4j.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/log4j.jar
usr/share/java/mx4j.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/mx4j.jar
usr/share/java/mx4j-remote.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/mx4j-remote.jar
-usr/share/java/saxon9.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/saxon9.jar
+usr/share/java/saxon.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/saxon.jar
usr/share/java/serializer.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/serializer.jar
usr/share/java/xercesImpl.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/xercesImpl.jar
usr/share/java/xml-apis.jar
usr/share/cruisecontrol/webapps/cruisecontrol/WEB-INF/lib/xml-apis.jar
Modified: trunk/cruisecontrol/debian/cruisecontrol.links
===================================================================
--- trunk/cruisecontrol/debian/cruisecontrol.links 2009-11-26 11:50:45 UTC
(rev 11128)
+++ trunk/cruisecontrol/debian/cruisecontrol.links 2009-11-26 15:44:29 UTC
(rev 11129)
@@ -30,8 +30,8 @@
usr/share/java/mx4j.jar usr/share/cruisecontrol/lib/mx4j.jar
usr/share/java/mx4j-remote.jar usr/share/cruisecontrol/lib/mx4j-remote.jar
usr/share/java/mx4j-tools.jar usr/share/cruisecontrol/lib/mx4j-tools.jar
-usr/share/java/saxon9-dom.jar usr/share/cruisecontrol/lib/saxon9-dom.jar
-usr/share/java/saxon9.jar usr/share/cruisecontrol/lib/saxon9.jar
+usr/share/java/saxon-dom.jar usr/share/cruisecontrol/lib/saxon-dom.jar
+usr/share/java/saxon.jar usr/share/cruisecontrol/lib/saxon.jar
usr/share/java/serializer.jar usr/share/cruisecontrol/lib/serializer.jar
usr/share/java/servlet-api-2.5.jar
usr/share/cruisecontrol/lib/servlet-api-2.5.jar
usr/share/java/smack.jar usr/share/cruisecontrol/lib/smack.jar
Modified: trunk/cruisecontrol/debian/patches/01_disable_components.diff
===================================================================
--- trunk/cruisecontrol/debian/patches/01_disable_components.diff
2009-11-26 11:50:45 UTC (rev 11128)
+++ trunk/cruisecontrol/debian/patches/01_disable_components.diff
2009-11-26 15:44:29 UTC (rev 11129)
@@ -1,7 +1,7 @@
Index: cruisecontrol-2.8.2/main/build.xml
===================================================================
---- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-22 23:24:34.000000000
+0530
-+++ cruisecontrol-2.8.2/main/build.xml 2009-11-24 12:02:00.000000000 +0530
+--- 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 @@
<attribute name="classpathref" default="project.classpath" />
<element name="nested" implicit="true" optional="true" />
@@ -40,9 +40,9 @@
<copy todir="${test.classes}">
Index: cruisecontrol-2.8.2/reporting/jsp/build.xml
===================================================================
---- cruisecontrol-2.8.2.orig/reporting/jsp/build.xml 2009-11-22
23:24:34.000000000 +0530
-+++ cruisecontrol-2.8.2/reporting/jsp/build.xml 2009-11-24
12:02:25.000000000 +0530
-@@ -152,19 +152,23 @@
+--- 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
+@@ -152,19 +152,29 @@
<attribute name="classpathref" default="project.runtime.classpath" />
<element name="nested" implicit="true" optional="true" />
<sequential>
@@ -57,6 +57,12 @@
- <compile-macro/>
+ <compile-macro>
+ <exclude name="**/*ChartData.java"/>
++ <exclude name="**/ConfigurationInterceptor.java"/>
++ <exclude name="**/ConfigurationServlet.java"/>
++ <exclude name="**/DetailsInterceptor.java"/>
++ <exclude name="**/PluginsServlet.java"/>
++ <exclude name="**/PluginsInterceptor.java"/>
++ <exclude name="**/PluginDetailsServlet.java"/>
+ </compile-macro>
</target>
@@ -69,19 +75,19 @@
</target>
<target name="test" depends="compile-test" unless="test.skip"
description="Executes the unit tests">
-@@ -220,7 +224,7 @@
+@@ -220,7 +230,7 @@
<copy file="webwork.properties" todir="${classes}"/>
<copy file="xwork.xml" todir="${classes}"/>
<war warfile="${deploy.dir}/cruisecontrol.war"
webxml="${temp.dir}/web.xml">
- <fileset dir="${webcontent}" excludes="WEB-INF/web.xml"/>
-+ <fileset dir="${webcontent}"
excludes="WEB-INF/web.xml,metrics.jsp"/>
++ <fileset dir="${webcontent}"
excludes="WEB-INF/web.xml,config.jsp,details.jsp,metrics.jsp,plugins.jsp,raw-xml.jsp"/>
<classes dir="${classes}"/>
<lib refid="req.libs"/>
<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-22
23:24:34.000000000 +0530
-+++ cruisecontrol-2.8.2/reporting/jsp/webcontent/main.jsp 2009-11-24
12:02:00.000000000 +0530
+--- 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
@@ -72,9 +72,9 @@
<cruisecontrol:loglink id="logs_url"/>
<cruisecontrol:tab name="log" url="<%=logs_url%>" label="XML
Log File" />
Modified: trunk/cruisecontrol/debian/rules
===================================================================
--- trunk/cruisecontrol/debian/rules 2009-11-26 11:50:45 UTC (rev 11128)
+++ trunk/cruisecontrol/debian/rules 2009-11-26 15:44:29 UTC (rev 11129)
@@ -7,7 +7,7 @@
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 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_ANT_BUILD_TARGET := build website bin-zip
-DEB_ANT_ARGS := -verbose -Dtest.skip=true
+DEB_ANT_ARGS := -Dtest.skip=true
install/cruisecontrol::
mkdir -p debian/cruisecontrol/usr/share/cruisecontrol
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
