dev/null |binary
java/buildconf/builder/config/satellite/default/rhn_hibernate.conf | 30
java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf | 16
java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf | 6
java/buildconf/builder/config/satellite/default/rhn_web.conf | 325 ----------
java/buildconf/builder/config/satellite/rhn.conf | 44 -
java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java | 68 --
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
9 files changed, 9 insertions(+), 491 deletions(-)
New commits:
commit a0ba64524a9f6fee5c9b16be5eeba5fe599fe0c9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 17:52:09 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.141-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8e95812..74835b5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.140
+Version: 1.8.141
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 06 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.141-1
+- removing unused IsoServlet
+- removing java/buildconf/builder directory
+- CryptoKeysHandlerTest are undertaken with OrgAdmin privileges.
+- 815964 - not critical, but adding to this version of rhn_web.conf too
+- 815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
+
* Tue Sep 04 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.140-1
- 853444 - list only subscribable base channels for actiovation key
associations
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a42cffa..2df2e6e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.140-1 java/
+1.8.141-1 java/
commit de446f44d549ce82b3e56f32ec04b4a9ad60c798
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 16:10:16 2012 +0200
removing unused IsoServlet
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java
b/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java
deleted file mode 100644
index 510d800..0000000
--- a/java/code/src/com/redhat/rhn/frontend/servlets/IsoServlet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.frontend.servlets;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet which streams ISO files. Should be mapped to "*.iso"
- *
- * @version $Rev $
- */
-public class IsoServlet extends HttpServlet {
-
- private int chunkSize = -1;
-
- /**
- * {@inheritDoc}
- */
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- String configChunkSize = config.getInitParameter("chunk-size");
- if (configChunkSize != null) {
- try {
- chunkSize = Integer.parseInt(configChunkSize);
- }
- catch (NumberFormatException e) {
- chunkSize = 8192;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- InputStream in = new FileInputStream("/test-iso" +
request.getServletPath());
- byte[] chunk = new byte[this.chunkSize];
- int readsize = 0;
- response.setContentType("application/octet-stream");
- OutputStream out = response.getOutputStream();
- while ((readsize = in.read(chunk)) > 0) {
- out.write(chunk, 0, readsize);
- }
- response.flushBuffer();
- }
-}
commit 637c9136b25749613ed5108b7324f976214ea55e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 6 14:17:44 2012 +0200
removing java/buildconf/builder directory
diff --git a/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf
b/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf
deleted file mode 100644
index f5ad273..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_hibernate.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-## HIBERNATE CONFIGURATION
-##
-## This is not the only way to configure hibernate. You can
-## create a hibernate.cfg.xml file or you can create your own
-## custom file which you parse and create a new Configuration object.
-##
-## We're using the hibernate.properties file because it's simple.
-############################################################################
-#hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.driver_proto=
-
-hibernate.use_outer_join=true
-hibernate.jdbc.batch_size=0
-#hibernate.show_sql=true
-
-hibernate.c3p0.min_size=5
-hibernate.c3p0.max_size=20
-hibernate.c3p0.timeout=300
-#
-# This should always be 0.
-#
-hibernate.c3p0.max_statements=0
-hibernate.c3p0.idle_test_period=300
-
-hibernate.cache.provider_class=org.hibernate.cache.OSCacheProvider
-hibernate.cache.use_query_cache=true
-hibernate.bytecode.use_reflection_optimizer=false
diff --git a/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf
b/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf
deleted file mode 100644
index c0905aa..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_org_quartz.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# RHN configuration file for the Quartz Job scheduler
-
-#org.quartz.scheduler.instanceName = DefaultQuartzScheduler
-#org.quartz.scheduler.rmi.export = false
-#org.quartz.scheduler.rmi.proxy = false
-#org.quartz.scheduler.wrapJobExecutionInUserTransaction = false
-
-#org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-#org.quartz.threadPool.threadCount = 10
-#org.quartz.threadPool.threadPriority = 5
-#org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread = true
-
-#org.quartz.jobStore.misfireThreshold = 60000
-
-#org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
-
diff --git a/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf
b/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf
deleted file mode 100644
index 65152a2..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_taskomatic.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-taskomatic.tasks = com.redhat.rhn.task.HelloWorldTask
-#, com.redhat.rhn.task.DailySummary
-# Use cron format for scheduling tasks
-taskomatic.com.redhat.rhn.task.HelloWorldTask.schedule = * * * * * ?
-# every 30 seconds
-taskomatic.com.redhat.rhn.task.DailSummary.schedule = 30 * * * * ?
diff --git a/java/buildconf/builder/config/satellite/default/rhn_web.conf
b/java/buildconf/builder/config/satellite/default/rhn_web.conf
deleted file mode 100644
index c335883..0000000
--- a/java/buildconf/builder/config/satellite/default/rhn_web.conf
+++ /dev/null
@@ -1,325 +0,0 @@
-# comma separated list of Class::Name(s) that contain a
-# register_acl_handlers function, which will be called for every acl used
-# on this site
-web.base_acls = RHN::Access
-
-# this is the domain and port of the request, in terms of something
-# suitable for a Redirect or a Cookie domain. it is either the Host:
-# header of the incoming request, a hardcoded config value, or set by
-# the frontend mod_paf proxy via X-Server-Hostname.
-web.base_domain =
-web.base_port =
-
-# Limit the size of POST data (in bytes)
-web.post_max = 512000
-
-# host bounces should be set to
-web.bounce_to_host =
mailer.webdev-colo.redhat.com
-
-# Location of external channel family licenses (ex. BEA JRockit, etc)
-web.channel_licenses_path =
-
-# offset for the database's timezone from utc
-web.db_tz_offset = 0
-
-# show PXT::Debug->log entries of this level and lower
-web.debug = 1
-
-# Default classes to instantiate when taskmaster runs (classes must be ISA
-# RHN::Task)
-web.default_taskmaster_tasks =
-
-# RHN::Mail never send email to these domains
-web.disallowed_mail_domains = localhost.localdomain, localhost
-
-# URL for the download server
-web.download_url =
-
-# URL for download kickstart data
-web.kickstart_host =
-
-# perform outgoing i18n; experimental
-web.enable_i18n = 0
-
-# Whether to enable OAI sync wrapper calls; mainline RHN only
-web.enable_oai_sync = 0
-
-# use crypt(3) for passwords in database
-web.encrypted_passwords = 0
-
-# Directory where RHN::Postal searches for formletters.
-web.formletter_dir = /var/www/html/formletters
-
-# Hour of the day, in EST24, that the throttling of freeloaders ends
-web.freeloader_throttle_end = 17
-
-# Hour of the day, in EST24, that the throttling of freeloaders begins
-web.freeloader_throttle_start = 9
-
-# keyring for GPG activity in httpd
-web.gpg_keyring = /etc/webapp-keyring.gpg
-
-# Maximum username length
-web.max_user_len = 63
-
-# Minimum username length
-web.min_user_len = 5
-
-# package mount directory
-web.mount_point = /pub/
-
-# package mount directory
-web.kickstart_mount_point = /pub/
-
-# Address all order confirmations are BCC'd too
-web.order_bcc_address =
-
-# Time in seconds to allow for a page render operation before showing a
-# warning.
-web.page_timing_threshold = 0
-
-# PAM service that controls authentication, or empty to disable PAM auth
-web.pam_auth_service =
-
-# comma separated list of Class::Name->method that
-# are called in sequence to validate formvars
-web.param_cleansers = RHN::Cleansers->cleanse
-
-# Verisign Payflow Pro certificate location
-web.pfpro_cert_path = /etc/httpd/conf/payflow-certs/
-
-# Verisign Payflow Pro fraud tolerance level
-web.pfpro_fraud_tolerance = 600
-
-# Verisign Payflow Pro partner
-web.pfpro_partner = VeriSign
-
-# Verisign Payflow Pro password
-web.pfpro_pwd = 123456
-
-# Verisign Payflow Pro server hostname
-web.pfpro_server =
test-payflow.verisign.com
-
-# Verisign Payflow Pro transaction type
-web.pfpro_trxtype = A
-
-# Verisign Payflow Pro user name
-web.pfpro_user = redhat1
-
-# Verisign Payflow Pro vendor
-web.pfpro_vendor = redhat1
-
-# Turn on DBI::Profile profiling of queries
-web.profile_queries = 0
-
-# RHN::Mail will only send e-mail to addresses matching these domains if
-# set.
-web.restrict_mail_domains =
redhat.com,
pattern.net
-
-# Package to use for RHN::GPG backend
-web.rhn_gpg_backend_module = RHN::GPG::OpenPGP
-
-# system is running in satellite mode
-web.satellite = 0
-
-# how long the session cookie lives, in cookie-time
-web.session_cookie_lifetime =
-
-# how long the session cookie lives in the database
-web.session_database_lifetime = 3600
-
-# RHN::Session secret 1
-web.session_secret_1 =
-
-# RHN::Session secret 2
-web.session_secret_2 =
-
-# RHN::Session secret 3
-web.session_secret_3 =
-
-# RHN::Session secret 4
-web.session_secret_4 =
-
-# RHN::SessionSwap secret 1
-web.session_swap_secret_1 =
-
-# RHN::SessionSwap secret 2
-web.session_swap_secret_2 =
-
-# RHN::SessionSwap secret 3
-web.session_swap_secret_3 =
-
-# RHN::SessionSwap secret 4
-web.session_swap_secret_4 =
-
-# Is SSL available? ie, are we allowed to redirect ssl?
-web.ssl_available = 0
-
-# The number of days to wait to hear from a system before warning that it
-# is not checking it.
-web.system_checkin_threshold = 1
-
-# Time in seconds to allow for a tag render operation before showing a
-# warning.
-web.tag_timing_threshold = 0
-
-# the address where internal server error tracebacks should be sent
-web.traceback_mail =
-
-# enable or disable sessions
-web.use_sessions = 1
-
-# Whether to use Verisign's Payflow Pro system for credit card auth
-web.use_verisign = 0
-
-# Whether to enable PXT-code controllable caching for logged out content
-web.enable_caching = 1
-
-# Relative weights of possible download locations. choice is
-# probabalistic based on sum of weights. scale doesn't matter, but it
-# is easier to think of it when they all add up to 100
-web.download_local_weight = 100
-web.download_tpa_weight = 0
-web.download_akamai_weight = 0
-
-# lifetime of a URL generated by the download code, in seconds
-web.download_url_lifetime = 600
-
-# whether or not to turn SSL on when available for ISO and RPM downloads
-web.download_ssl_enable = 1
-
-# maximum package count for a tarball download
-web.download_tarball_max = 25
-
-# maximum number of times a token can be used
-web.download_token_limit = 5
-
-# default domainname for downloads
-web.download_local_domain =
-
-# crontab for the daily summary populator
-web.summary_populator_crontab = 0 4 * * *
-
-# number of seconds each cycle of the daily summary
-# reaper process will max out at for running through orgs...
-web.summary_reaper_batch_time = 30
-
-# crontab for the user deletion task
-web.user_deletion_crontab = 30 * * * *
-web.user_deletion_batch_time = 30
-
-# emails for the support tool stuff
-web.support_email = rhn-support(a)redhat.com
-web.customer_service_email =
-
-# requests for account deletion go here
-web.account_deletion_address = rhn-traffic(a)redhat.com
-
-# email address to send FAQ publication requests to
-web.faq_publication_email = rhn-traffic(a)redhat.com
-
-# email address to send education account creation info to
-web.education_account_email = rhn-traffic(a)redhat.com
-
-# is this system in a development environment?
-web.development_environment = 0
-
-# default DSN in /etc/pxtdb.conf to connect to for PXT itself
-web.pxt_database_dsn = webdev
-
-# default_db setting from python land, form of user/pass@tnsname
-web.default_db =
-
-# trace all sessions? (never enable in prod!)
-web.trace_session = 0
-
-# email address for feedback
-web.rhn_feedback_address = rhn-feedback(a)redhat.com
-
-# max number of sets of isos the "Latest ISOs" page should use
-web.max_latest_iso_categories = 3
-
-# download ISO channels to show on the easy download page; conf var
-# since itt changes with each release
-web.popular_iso_channels =
-
-web.config_delim_start = {|
-web.config_delim_end = |}
-
-# Bcc that RHN::Task::PushedUsers sends mails to
-web.pushed_users_bcc = rh-it-customers(a)redhat.com
-
-# the version of this RHN install as a whole
-web.version = 4.0.0
-
-# maximum size for a config file
-web.maximum_config_file_size = 131072
-
-# lifetime for sandboxes, in days
-web.sandbox_lifetime = 3
-
-# facility rhn web daemons (primarily taskomatic) should use for
-# logging valid values: local0, local1, local2, ..., local7
-web.daemon_logging_facility = local7
-
-# default debug level for daemons. 0 == silence, 1 == info, 2 == debug, 3 == trace
-web.daemon_debug_level = 1
-
-# email address to send satellite emails from
-web.default_mail_from = Red Hat Network <dev-null(a)rhn.redhat.com>
-
-# should this system run the monitoring backend code?
-web.is_monitoring_backend = 0
-
-# should this system run the monitoring scout code?
-web.is_monitoring_scout = 0
-
-# how many monitoring probes to update at once. Large batches (eg. thousands)
-# can lead to database deadlocks.
-web.monitoring_probes_batch_size = 50
-
-# server configs needed for satellite installer
-server.satellite.rhn_parent =
-server.satellite.http_proxy =
-server.satellite.http_proxy_username =
-server.satellite.http_proxy_password =
-server.satellite.ca_chain =
-
-# temporary config var protecting the msg bus wakeup code in prod
-web.osa_tickle_enabled = 0
-
-# crontab for the entitlement poller.
-web.ep_crontab = 30 * * * *
-web.ep_poll_duration = 30 # end after 30 seconds
-web.ep_commit_interval = 50 # do a commit at least every 50 orgs processed.
-
-# threshold for errata cache script vs website login computation.
-# increase it to make for slower logins but faster EC runs, decrese it
-# vice versa
-web.errata_cache_compute_threshold = 30
-
-# Need a mechanism to know if we need to prefix the
-# pxt-session-cookies with the hostname. In the perl/world this
-# is a PerlSetVar in httpd.conf, but in the Java world we need
-# to put it in here.
-web.allow_pxt_personalities = 0
-
-# Configure the set of XML message files for the system
-# These packages indicate where the XML Resource bundles should
-# be located relative to the java class structure.
-web.l10n_resourcebundles=com.redhat.rhn.frontend.strings.jsp.StringPackage,com.redhat.rhn.frontend.strings.java.StringPackage,com.redhat.rhn.frontend.strings.database.StringPackage,com.redhat.rhn.frontend.strings.nav.StringPackage,com.redhat.rhn.frontend.strings.template.StringPackage
-
-# Puts the LocalizationService into debug mode so all the
-# messages in the web UI will show up with a marker around them to indicate they
-# have been externalized with calls to fetch their translated resource.
-web.l10n_debug=false
-web.l10n_debug_marker=$$$
-
-# List of supported locales
-web.supported_locales=bn_IN,de,en_US,es,fr,gu,hi,it,ja,ko,pa,pt_BR,ru,ta,zh_CN,zh_TW
-
-# List of countries to exclude for new user creation
-# This is currently: Cuba,Iran,Iraq,North Korea,Lybia,Sudan,Syria
-web.excluded_countries=CU,IR,IQ,KP,LY,SD,SY
-
-web.taskomatic_cobbler_user = taskomatic_user
diff --git a/java/buildconf/builder/config/satellite/rhn.conf
b/java/buildconf/builder/config/satellite/rhn.conf
deleted file mode 100644
index 7fb4bbe..0000000
--- a/java/buildconf/builder/config/satellite/rhn.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# Required for Java code to understand personalities.
-web.allow_pxt_personalities = 1
-
-web.traceback_mail = jesusr@redhat.com,mmccune(a)redhat.com
-
-web.session_swap_secret_1 = 853e3324bfcf90a98f29396728dfd3e0
-web.session_swap_secret_2 = 8cb0a0505b474d99caae5f44e8068b47
-web.session_swap_secret_3 = 35475259596c0e1da6ea718a4eb3023d
-web.session_swap_secret_4 = b940aba9a00de60b854ef783cdf0f414
-
-web.session_secret_1 = 96cbc947c663121211337de27483a5713d0d0b
-web.session_secret_2 = 4add7d47d25378c950bc9be1212128a7bb33c9
-web.session_secret_3 = 0bddbf499dba0fa2c8adsfasdfadf115c9159c81658
-web.session_secret_4 = a983868cd63dadfvxbhfnh dg aerb5efbceec9da7811asdfaeb5c
-
-web.session_database_lifetime = 3600
-
-web.restrict_mail_domains=redhat.com,
pattern.net
-
-# email address to send satellite emails from
-web.default_mail_from=Red Hat Network <dev-null(a)rhn.redhat.com>
-
-enable_oai_sync=1
-
-#Sat specific configs
-web.satellite = 1
-web.encrypted_passwords = 1
-web.is_monitoring_backend = 1
-
-db_user=rhnsat
-db_password=rhnsat
-db_name=//rlx-2-10.rhndev.redhat.com:1521/rhnsat.world
-
-do.orig.user.domain = 1
-web.default_db=rhnsat/rhnsat@rhnsat
-
-web.legacy_user_enabled = 1
-web.legacy_save_enabled = 1
-
-hibernate.connection.driver_proto=jdbc:log:oracle.jdbc.driver.OracleDriver:oracle:thin
-hibernate.connection.driver_class=net.rkbloom.logdriver.LogDriver
-
-web.product_name = Spacewalk
diff --git a/java/buildconf/builder/config/satellite/webapp-keyring.gpg
b/java/buildconf/builder/config/satellite/webapp-keyring.gpg
deleted file mode 100644
index 33a38ef..0000000
Binary files a/java/buildconf/builder/config/satellite/webapp-keyring.gpg and /dev/null
differ