java/conf/rhn.xml | 3 +--
java/conf/rhn6.xml | 22 ----------------------
java/spacewalk-java.spec | 2 +-
3 files changed, 2 insertions(+), 25 deletions(-)
New commits:
commit a7b8c4c49ee485b415aa06c2bc5a06f61e2be288
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Oct 24 10:24:50 2011 +0200
No need to have separate configuration per Tomcat's version
This basically reverts 7c61f92243852d8a52abdf6f894204155aff20e0.
diff --git a/java/conf/rhn6.xml b/java/conf/rhn6.xml
deleted file mode 100644
index 8c88a59..0000000
--- a/java/conf/rhn6.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- 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" debug="0" reloadable="false"
allowLinking="true">
-</Context>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 697b49c..0b15bd9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -324,7 +324,7 @@ install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/local
%else
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/
-install -m 755 conf/rhn6.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
+install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
# check spelling errors in all resources for English if aspell installed
commit c81087e771e60bae00b7c74298a1f95b13207892
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Oct 24 10:18:51 2011 +0200
748341 - No need to specify docBase, when it's the same as appBase
Addressing:
WARNING: A docBase /var/lib/tomcat6/webapps/rhn inside the host appBase has been
specified, and will be ignored
diff --git a/java/conf/rhn.xml b/java/conf/rhn.xml
index 3d717b88..8c88a59 100644
--- a/java/conf/rhn.xml
+++ b/java/conf/rhn.xml
@@ -17,6 +17,5 @@
allowLinking - true to allow Tomcat to follow symlinks.
-->
-<Context path="/rhn" docBase="/var/lib/tomcat5/webapps/rhn/"
- debug="0" reloadable="false"
allowLinking="true">
+<Context path="/rhn" debug="0" reloadable="false"
allowLinking="true">
</Context>
diff --git a/java/conf/rhn6.xml b/java/conf/rhn6.xml
index 7761aef..8c88a59 100644
--- a/java/conf/rhn6.xml
+++ b/java/conf/rhn6.xml
@@ -17,6 +17,5 @@
allowLinking - true to allow Tomcat to follow symlinks.
-->
-<Context path="/rhn" docBase="/var/lib/tomcat6/webapps/rhn/"
- debug="0" reloadable="false"
allowLinking="true">
+<Context path="/rhn" debug="0" reloadable="false"
allowLinking="true">
</Context>