java/buildconf/build-props.xml | 6 +--
java/conf/default/rhn_taskomatic_daemon.conf | 47 +++++++++++++--------------
java/ivy.xml | 1
java/spacewalk-java.spec | 2 -
4 files changed, 26 insertions(+), 30 deletions(-)
New commits:
commit bc104976e0e7c61cd78821fd41dc902d7451555c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 22 15:48:48 2011 +0100
no class from commons-fileupload is used
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 90e0a34..f5a053e 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -66,7 +66,7 @@
log4j oro redstone-xmlrpc-client redstone-xmlrpc ${struts-jars}
${tomcat-jars}
bcprov bcpg jcommon stringtree-json postgresql-jdbc
${jfreechart} taglibs-core logdriver quartz dwr slf4j-api slf4j-log4j12
- commons-fileupload commons-io concurrent velocity simple-core" />
+ commons-io concurrent velocity simple-core" />
<property name="test.jar.dependencies"
value="antlr checkstyle dom4j emma emma_ant jdom jta junit
@@ -111,13 +111,13 @@
log4j oro redstone-xmlrpc-client redstone-xmlrpc ${struts-jars}
jcommon stringtree-json postgresql-jdbc
${jfreechart} taglibs-core quartz
- commons-fileupload concurrent simple-core" />
+ concurrent simple-core" />
<property name="dist.jar.dependencies"
value="antlr ${asm} bcel c3p0 cglib
commons-collections commons-beanutils commons-cli commons-codec
commons-digester commons-discovery commons-el
- commons-fileupload commons-io commons-lang commons-logging
+ commons-io commons-lang commons-logging
commons-validator concurrent dom4j hibernate3 jta
jaf ${jasper-jars} javamail jcommon jdom ${other-jars}
${jfreechart} ${tomcat-jars} jpam log4j redstone-xmlrpc-client
redstone-xmlrpc
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf
b/java/conf/default/rhn_taskomatic_daemon.conf
index 57266ca..3ea6611 100644
--- a/java/conf/default/rhn_taskomatic_daemon.conf
+++ b/java/conf/default/rhn_taskomatic_daemon.conf
@@ -57,30 +57,29 @@ wrapper.java.classpath.33=/usr/share/java/commons-lang.jar
wrapper.java.classpath.34=/usr/share/java/commons-digester.jar
wrapper.java.classpath.35=/usr/share/java/jasper5-runtime.jar
wrapper.java.classpath.36=/usr/share/java/jspapi.jar
-wrapper.java.classpath.37=/usr/share/java/commons-fileupload.jar
-wrapper.java.classpath.38=/usr/share/java/c3p0.jar
-wrapper.java.classpath.39=/usr/share/java/sitemesh.jar
-wrapper.java.classpath.40=/usr/share/java/jasper5-compiler.jar
-wrapper.java.classpath.41=/usr/share/java/axis/saaj.jar
-wrapper.java.classpath.42=/usr/share/java/commons-logging.jar
-wrapper.java.classpath.43=/usr/share/java/commons-discovery.jar
-wrapper.java.classpath.44=/usr/share/java/xml-commons-apis.jar
-wrapper.java.classpath.45=/usr/share/java/axis/jaxrpc.jar
-wrapper.java.classpath.46=/usr/share/java/commons-cli.jar
-wrapper.java.classpath.47=/usr/share/java/bcel.jar
-wrapper.java.classpath.48=/usr/share/java/antlr.jar
-wrapper.java.classpath.49=/usr/share/java/xerces-j2.jar
-wrapper.java.classpath.50=/usr/share/java/hibernate3.jar
-wrapper.java.classpath.51=/usr/share/java/cglib.jar
-wrapper.java.classpath.52=/usr/share/java/dom4j.jar
-wrapper.java.classpath.53=/usr/share/rhn/lib/java-branding.jar
-wrapper.java.classpath.54=/usr/share/java/slf4j-api.jar
-wrapper.java.classpath.55=/usr/share/java/slf4j-jcl.jar
-wrapper.java.classpath.56=/usr/share/java/simple-core.jar
-wrapper.java.classpath.57=/usr/share/java/commons-dbcp.jar
-wrapper.java.classpath.58=/usr/share/java/commons-pool.jar
-wrapper.java.classpath.59=/usr/share/java/quartz-oracle.jar
-wrapper.java.classpath.60=/usr/share/java/postgresql-jdbc.jar
+wrapper.java.classpath.37=/usr/share/java/c3p0.jar
+wrapper.java.classpath.38=/usr/share/java/sitemesh.jar
+wrapper.java.classpath.39=/usr/share/java/jasper5-compiler.jar
+wrapper.java.classpath.40=/usr/share/java/axis/saaj.jar
+wrapper.java.classpath.41=/usr/share/java/commons-logging.jar
+wrapper.java.classpath.42=/usr/share/java/commons-discovery.jar
+wrapper.java.classpath.43=/usr/share/java/xml-commons-apis.jar
+wrapper.java.classpath.44=/usr/share/java/axis/jaxrpc.jar
+wrapper.java.classpath.45=/usr/share/java/commons-cli.jar
+wrapper.java.classpath.46=/usr/share/java/bcel.jar
+wrapper.java.classpath.47=/usr/share/java/antlr.jar
+wrapper.java.classpath.48=/usr/share/java/xerces-j2.jar
+wrapper.java.classpath.49=/usr/share/java/hibernate3.jar
+wrapper.java.classpath.50=/usr/share/java/cglib.jar
+wrapper.java.classpath.51=/usr/share/java/dom4j.jar
+wrapper.java.classpath.52=/usr/share/rhn/lib/java-branding.jar
+wrapper.java.classpath.53=/usr/share/java/slf4j-api.jar
+wrapper.java.classpath.54=/usr/share/java/slf4j-jcl.jar
+wrapper.java.classpath.55=/usr/share/java/simple-core.jar
+wrapper.java.classpath.56=/usr/share/java/commons-dbcp.jar
+wrapper.java.classpath.57=/usr/share/java/commons-pool.jar
+wrapper.java.classpath.58=/usr/share/java/quartz-oracle.jar
+wrapper.java.classpath.59=/usr/share/java/postgresql-jdbc.jar
# Java Additional Parameters
wrapper.java.additional.1=-Dibm.dst.compatibility=true
diff --git a/java/ivy.xml b/java/ivy.xml
index 6566efa..c5bccd4 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -18,7 +18,6 @@
<dependency org="redhat" name="commons-digester"
rev="1.6" />
<dependency org="redhat" name="commons-discovery"
rev="0.2" />
<dependency org="redhat" name="commons-el"
rev="1.0" />
- <dependency org="redhat" name="commons-fileupload"
rev="1.0" />
<dependency org="redhat" name="commons-httpclient"
rev="3.0" />
<dependency org="redhat" name="commons-lang"
rev="2.1" />
<dependency org="redhat" name="commons-logging"
rev="1.0.4" />
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 15e5c53..1cd985d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -118,7 +118,6 @@ BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-discovery
BuildRequires: jakarta-commons-el
-BuildRequires: jakarta-commons-fileupload
BuildRequires: jakarta-commons-io
BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
@@ -426,7 +425,6 @@ fi
%{jardir}/commons-digester.jar
%{jardir}/commons-discovery.jar
%{jardir}/commons-el.jar
-%{jardir}/commons-fileupload.jar
%{jardir}/commons-io.jar
%{jardir}/commons-lang.jar
%{jardir}/commons-logging.jar
Show replies by date