java/conf/rhn6.xml | 22 ++++++++++++++++++++++
java/spacewalk-java.spec | 6 +++---
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 37a83560c4477f5605d2de01b0c006fa03fc7683
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Feb 11 12:42:09 2010 -0500
Automatic commit of package [spacewalk-java] release [0.9.4-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 93a4190..13eb1aa 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.9.3
+Version: 0.9.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -304,7 +304,7 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
-* Thu Feb 11 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.3-1
+* Thu Feb 11 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.4-1
- adding snippet api unit tests (jsherril(a)redhat.com)
* Wed Feb 10 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.2-1
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e9f4bd2..66dd0a1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.9.3-1 java/
+0.9.4-1 java/
commit 7c61f92243852d8a52abdf6f894204155aff20e0
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Feb 11 12:39:33 2010 -0500
fixing rhn.xml for tomcat6
diff --git a/java/conf/rhn6.xml b/java/conf/rhn6.xml
new file mode 100644
index 0000000..7761aef
--- /dev/null
+++ b/java/conf/rhn6.xml
@@ -0,0 +1,22 @@
+<!--
+ This is a Tomcat 5 Context file. For more information see:
+
http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/context.html
+
+ path - is the url path you specify after
http://hostname:8080/. To
+ take over the root, you leave it empty.
+
+ docBase - should the fully qualified path where your
+ rhnwebapp is located.
+ i.e. /home/devel/username/rhn-java/rhnwebapp
+
+ debug - higher number produces more output.
+
+ reloadable - indicates to Tomcat that the webapp should be reloaded
+ when a change occurs.
+
+ allowLinking - true to allow Tomcat to follow symlinks.
+-->
+
+<Context path="/rhn" docBase="/var/lib/tomcat6/webapps/rhn/"
+ debug="0" reloadable="false"
allowLinking="true">
+</Context>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c2564a1..93a4190 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -214,7 +214,7 @@ install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT/%{_sysconfdir}/tomcat5/Catalina/loca
%else
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/tomcat6/Catalina/localhost/
-install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT/%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
+install -m 755 conf/rhn6.xml
$RPM_BUILD_ROOT/%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
install -d -m 755 $RPM_BUILD_ROOT/%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}