Branch 'VADER' - 3 commits - java/code search-server/rhn_search_daemon_dev.conf search-server/run.sh
by Jesus M. Rodriguez
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 43 +++++++++-
search-server/rhn_search_daemon_dev.conf | 9 +-
search-server/run.sh | 2
3 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit 01efd4c9fb0023cf47c19b19b31e36eddb1e95fb
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Jun 1 16:20:52 2009 -0400
496933 - update the errata index when publishing an errata.
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index 8b42266..2535b63 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -63,6 +63,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import redstone.xmlrpc.XmlRpcClient;
+import redstone.xmlrpc.XmlRpcFault;
+
/**
* ErrataManager is the singleton class used to provide business operations
* on Errata, where those operations interact with other top tier business
@@ -125,7 +128,7 @@ public class ErrataManager extends BaseManager {
/**
* Takes an unpublished errata and returns a published errata into the
* channels we pass in. NOTE: This method does NOT update the errata cache for
- * the channels. THat is done when packages are pushed as part of the errata
+ * the channels. That is done when packages are pushed as part of the errata
* publication process (which is not done here)
*
* @param unpublished The errata to publish
@@ -140,6 +143,9 @@ public class ErrataManager extends BaseManager {
retval = addChannelsToErrata(retval, channelIds, user);
log.debug("publish - updateErrataCacheForChannelsAsync called");
+
+ // update the search server
+ updateSearchIndex();
return retval;
}
@@ -153,6 +159,9 @@ public class ErrataManager extends BaseManager {
//pass on to the factory
Errata retval = ErrataFactory.publish(unpublished);
log.debug("publish - errata published");
+
+ // update the search server
+ updateSearchIndex();
return retval;
}
@@ -1197,5 +1206,35 @@ public class ErrataManager extends BaseManager {
return m.execute(params);
}
-
+ /**
+ * update the errata search index.
+ * @return true if index was updated, false otherwise.
+ */
+ private static boolean updateSearchIndex() {
+ boolean flag = false;
+
+ try {
+ XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true);
+ List args = new ArrayList();
+ args.add("errata");
+ Boolean rc = (Boolean)client.invoke("admin.updateIndex", args);
+ flag = rc.booleanValue();
+ }
+ catch (XmlRpcFault e) {
+ // right now updateIndex doesn't throw any faults.
+ log.error("Errata index not updated. Search server unavailable." +
+ "ErrorCode = " + e.getErrorCode(), e);
+ e.printStackTrace();
+ }
+ catch (Exception e) {
+ // if the search server is down, folks will know when they
+ // attempt to search. If this call failed the errata in
+ // question won't be searchable immediately, but will get picked
+ // up the next time the search server runs the job (after being
+ // restarted.
+ log.error("Errata index not updated. Search server unavailable.", e);
+ }
+
+ return flag;
+ }
}
commit 8e99400b19fa5241ee5a3b4dfbe76c7f1d7553a7
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Jun 1 16:13:41 2009 -0400
added java debugger options for local dev config
diff --git a/search-server/rhn_search_daemon_dev.conf b/search-server/rhn_search_daemon_dev.conf
index d9f12ac..964fe46 100644
--- a/search-server/rhn_search_daemon_dev.conf
+++ b/search-server/rhn_search_daemon_dev.conf
@@ -34,7 +34,12 @@ wrapper.console.format=PM
wrapper.console.loglevel=INFO
wrapper.logfile=%PWD%/rhn_search_daemon.log
wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
+wrapper.logfile.loglevel=DEBUG
wrapper.logfile.maxsize=5m
wrapper.logfile.maxfiles=0
-wrapper.syslog.loglevel=NONE
+wrapper.syslog.loglevel=DEBUG
+
+wrapper.java.additional.1=-Dsearch.config.dir=%PWD%/src/config/search
+wrapper.java.additional.2=-Xdebug
+wrapper.java.additional.3=-Xnoagent
+wrapper.java.additional.4=-Xrunjdwp:transport=dt_socket,address=9999,server=y,suspend=n
commit 25cae0c660aaf2ffd1b0c967469f94d7035c9788
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Jun 1 16:13:13 2009 -0400
store pid file locally.
diff --git a/search-server/run.sh b/search-server/run.sh
index 7689518..0bbf58a 100755
--- a/search-server/run.sh
+++ b/search-server/run.sh
@@ -14,4 +14,4 @@ fi
echo "starting server"
export CLASSPATH=`pwd`/build
#java -Djava.library.path=/usr/lib -classpath `build-classpath-directory lib dist` com.redhat.satellite.search.Main
-/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile=rhn-search.pid wrapper.daemonize=FALSE
+/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile=`pwd`/rhn-search.pid wrapper.daemonize=FALSE
14 years, 11 months
Branch 'VADER' - 4 commits - projects/oracle-server-scripts spacewalk/setup
by Milan Zazrivec
projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl | 98 +++++++++++++
projects/oracle-server-scripts/oracle-server-scripts.spec | 3
spacewalk/setup/share/oracle/upgrade-db-10g.sh | 45 +++++
spacewalk/setup/spacewalk-setup.spec | 1
4 files changed, 146 insertions(+), 1 deletion(-)
New commits:
commit 4ff3296f8a3e5e060d24d9428291cf87fff1c0a6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:33:18 2009 +0200
include new embedded db upgrade script into spec file
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index cc43b6d..f75a493 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -75,6 +75,7 @@ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/oracle/
install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
+install -m 0755 share/oracle/upgrade-db-10g.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
%check
commit e72f71b640f4f19237ec12e2b85fb800623a2cf0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:31:28 2009 +0200
add 10g 10.2.0.3 -> 10.2.0.4 embedded db setup upgrade script
diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/setup/share/oracle/upgrade-db-10g.sh
new file mode 100644
index 0000000..36b8be7
--- /dev/null
+++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Upgrades RHN embedded database at mountpoint /rhnsat (10g ver 10.2.0.3 -> 10g ver. 10.2.0.4)
+#
+# Copyright (c) 2009 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.
+
+set -x
+
+# exit if anything fails
+set -e
+
+# set oracle environment to embedded server
+ORAENV_ASK=NO
+ORACLE_BASE=/opt/apps/oracle
+ORACLE_ADMIN_DIR=$ORACLE_BASE/admin/10.2.0
+ORACLE_CONFIG_DIR=$ORACLE_BASE/config/10.2.0
+
+# change env to rhnsat instance
+if [ -z $ORACLE_CUSTOM_SID ]; then
+ export ORACLE_SID=rhnsat
+else
+ export ORACLE_SID=$ORACLE_CUSTOM_SID
+fi
+. oraenv
+
+# upgrade database
+UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl
+m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \
+ --define RHNORA_DBNAME=$ORACLE_SID \
+ --define RHNORA_LOG_PATH=/rhnsat/admin/rhnsat/logs \
+ --define RHNORA_DATA_PATH=/rhnsat/data/rhnsat \
+ --define RHNORA_DB_USER=rhnsat \
+ | $ORACLE_HOME/bin/sqlplus /nolog
+
+set +x
commit ed4eeadce9cc05b3cf1f91c6211795a7d2c3388c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:28:12 2009 +0200
include new source into spec file
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 2941245..3bdf392 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -23,6 +23,7 @@ Source9: default-createdb.tmpl
Source10: embedded-createdb.tmpl
Source11: rhnora.m4
Source12: embedded-upgradedb.tmpl
+Source13: embedded-upgradedb-10g.tmpl
License: Proprietary
Group: Oracle Server
BuildArch: noarch
@@ -45,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT
install -m755 -d $RPM_BUILD_ROOT%{oracle_admin}
for f in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%{SOURCE4} %{SOURCE5} %{SOURCE9} %{SOURCE10} %{SOURCE11} \
- %{SOURCE12}; do
+ %{SOURCE12} %{SOURCE13}; do
install -m 755 $f $RPM_BUILD_ROOT%{oracle_admin}
done
commit 37d56362427ffd0b8066818edf16eb268dbd119a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:24:56 2009 +0200
add template script for 10.2.0.3 -> 10.2.0.4 embedded db upgrade
diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
new file mode 100644
index 0000000..b0ac82b
--- /dev/null
+++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
@@ -0,0 +1,98 @@
+include(`rhnora.m4')
+
+--
+-- 10gR2 ver. 10.2.0.3 to 10gR2 ver. 10.2.0.4 embedded db upgrade template
+--
+
+
+spool RHNORA_CREATELOG(RHNORA_DBNAME-10g-10g-upgrade) replace
+set echo on
+set term on
+set pagesize 10000
+-- don't set serveroutput on otherwise you will get a lot of PLS-00213 errors
+--set serveroutput on
+whenever sqlerror exit failure
+whenever oserror exit failure
+
+connect / as sysdba
+-- create spfile from pfile='upgrade-init@.ora';
+startup upgrade
+
+alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS';
+
+-- ignore errors in oracle provided files
+whenever sqlerror continue
+
+-- do upgrade
+select sysdate, 'rdbms/admin/catupgrd.sql' script from dual;
+(a)?/rdbms/admin/catupgrd.sql
+
+-- show summary
+(a)?/rdbms/admin/utlu102s.sql
+
+-- invalidate all db objects
+select sysdate, 'Invalidating packages' message from dual;
+(a)?/rdbms/admin/utlirp.sql
+
+shutdown immediate
+startup restrict
+
+-- recompile all db stuff incl. java stored procs
+select sysdate, 'Recompiling packages' message from dual;
+(a)?/rdbms/admin/utlrp.sql
+
+whenever sqlerror exit failure
+set serveroutput on
+-- perform migration of DICTIONARY to LOCAL managed tablespaces
+begin
+ for s in (select tablespace_name from dba_tablespaces
+ where extent_management = 'DICTIONARY'
+ and tablespace_name = 'SYSTEM')
+ loop
+ for t in (select tablespace_name from dba_tablespaces
+ where extent_management = 'DICTIONARY'
+ and tablespace_name not in ('SYSTEM'))
+ loop
+ DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL(t.tablespace_name);
+ end loop;
+ for t in (select tablespace_name from dba_tablespaces
+ where contents='PERMANENT'
+ and tablespace_name not in ('SYSTEM','SYSAUX'))
+ loop
+ execute immediate 'alter tablespace ' || t.tablespace_name || ' read only';
+ end loop;
+ execute immediate 'alter tablespace SYSAUX offline';
+ DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL('SYSTEM');
+ execute immediate 'alter tablespace SYSAUX online';
+ for t in (select tablespace_name from dba_tablespaces
+ where status = 'READ ONLY')
+ loop
+ execute immediate 'alter tablespace ' || t.tablespace_name || ' read write';
+ end loop;
+ end loop;
+end;
+/
+
+-- restart the instance to reinitialize the system parameters
+shutdown immediate
+startup
+
+-- lock default users from 9i
+select sysdate, 'Locking default 9i users' message from dual;
+BEGIN
+ FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN (
+ 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') )
+ LOOP
+ dbms_output.put_line('Locking and Expiring: ' || item.USERNAME);
+ execute immediate 'alter user ' || item.USERNAME || ' password expire account lock' ;
+ END LOOP;
+END;
+/
+
+-- set compatible flag
+alter system set compatible='10.2.0.4.0' scope=spfile;
+disconnect
+
+connect / as sysdba
+shutdown immediate
+
14 years, 11 months
4 commits - projects/oracle-server-scripts spacewalk/setup
by Milan Zazrivec
projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl | 98 +++++++++++++
projects/oracle-server-scripts/oracle-server-scripts.spec | 3
spacewalk/setup/share/oracle/upgrade-db-10g.sh | 45 +++++
spacewalk/setup/spacewalk-setup.spec | 1
4 files changed, 146 insertions(+), 1 deletion(-)
New commits:
commit e8f5b62e1a91d3686fb294505bcb449df1754e9e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:33:18 2009 +0200
include new embedded db upgrade script into spec file
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6e007cc..00e6018 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -75,6 +75,7 @@ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/oracle/
install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
+install -m 0755 share/oracle/upgrade-db-10g.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
%check
commit 8652f6b737069d50408ef1457f2256ce790ac42a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:31:28 2009 +0200
add 10g 10.2.0.3 -> 10.2.0.4 embedded db setup upgrade script
diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/setup/share/oracle/upgrade-db-10g.sh
new file mode 100644
index 0000000..36b8be7
--- /dev/null
+++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Upgrades RHN embedded database at mountpoint /rhnsat (10g ver 10.2.0.3 -> 10g ver. 10.2.0.4)
+#
+# Copyright (c) 2009 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.
+
+set -x
+
+# exit if anything fails
+set -e
+
+# set oracle environment to embedded server
+ORAENV_ASK=NO
+ORACLE_BASE=/opt/apps/oracle
+ORACLE_ADMIN_DIR=$ORACLE_BASE/admin/10.2.0
+ORACLE_CONFIG_DIR=$ORACLE_BASE/config/10.2.0
+
+# change env to rhnsat instance
+if [ -z $ORACLE_CUSTOM_SID ]; then
+ export ORACLE_SID=rhnsat
+else
+ export ORACLE_SID=$ORACLE_CUSTOM_SID
+fi
+. oraenv
+
+# upgrade database
+UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl
+m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \
+ --define RHNORA_DBNAME=$ORACLE_SID \
+ --define RHNORA_LOG_PATH=/rhnsat/admin/rhnsat/logs \
+ --define RHNORA_DATA_PATH=/rhnsat/data/rhnsat \
+ --define RHNORA_DB_USER=rhnsat \
+ | $ORACLE_HOME/bin/sqlplus /nolog
+
+set +x
commit c44e250c119d3c5ef578d9181fb9a5f0217c481a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:28:12 2009 +0200
include new source into spec file
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index faa736e..93c042b 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -23,6 +23,7 @@ Source9: default-createdb.tmpl
Source10: embedded-createdb.tmpl
Source11: rhnora.m4
Source12: embedded-upgradedb.tmpl
+Source13: embedded-upgradedb-10g.tmpl
License: Proprietary
Group: Oracle Server
BuildArch: noarch
@@ -45,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT
install -m755 -d $RPM_BUILD_ROOT%{oracle_admin}
for f in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%{SOURCE4} %{SOURCE5} %{SOURCE9} %{SOURCE10} %{SOURCE11} \
- %{SOURCE12}; do
+ %{SOURCE12} %{SOURCE13}; do
install -m 755 $f $RPM_BUILD_ROOT%{oracle_admin}
done
commit 7f1f9420a150447608a90962553d1d605cfd674c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 19:24:56 2009 +0200
add template script for 10.2.0.3 -> 10.2.0.4 embedded db upgrade
diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
new file mode 100644
index 0000000..b0ac82b
--- /dev/null
+++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
@@ -0,0 +1,98 @@
+include(`rhnora.m4')
+
+--
+-- 10gR2 ver. 10.2.0.3 to 10gR2 ver. 10.2.0.4 embedded db upgrade template
+--
+
+
+spool RHNORA_CREATELOG(RHNORA_DBNAME-10g-10g-upgrade) replace
+set echo on
+set term on
+set pagesize 10000
+-- don't set serveroutput on otherwise you will get a lot of PLS-00213 errors
+--set serveroutput on
+whenever sqlerror exit failure
+whenever oserror exit failure
+
+connect / as sysdba
+-- create spfile from pfile='upgrade-init@.ora';
+startup upgrade
+
+alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS';
+
+-- ignore errors in oracle provided files
+whenever sqlerror continue
+
+-- do upgrade
+select sysdate, 'rdbms/admin/catupgrd.sql' script from dual;
+(a)?/rdbms/admin/catupgrd.sql
+
+-- show summary
+(a)?/rdbms/admin/utlu102s.sql
+
+-- invalidate all db objects
+select sysdate, 'Invalidating packages' message from dual;
+(a)?/rdbms/admin/utlirp.sql
+
+shutdown immediate
+startup restrict
+
+-- recompile all db stuff incl. java stored procs
+select sysdate, 'Recompiling packages' message from dual;
+(a)?/rdbms/admin/utlrp.sql
+
+whenever sqlerror exit failure
+set serveroutput on
+-- perform migration of DICTIONARY to LOCAL managed tablespaces
+begin
+ for s in (select tablespace_name from dba_tablespaces
+ where extent_management = 'DICTIONARY'
+ and tablespace_name = 'SYSTEM')
+ loop
+ for t in (select tablespace_name from dba_tablespaces
+ where extent_management = 'DICTIONARY'
+ and tablespace_name not in ('SYSTEM'))
+ loop
+ DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL(t.tablespace_name);
+ end loop;
+ for t in (select tablespace_name from dba_tablespaces
+ where contents='PERMANENT'
+ and tablespace_name not in ('SYSTEM','SYSAUX'))
+ loop
+ execute immediate 'alter tablespace ' || t.tablespace_name || ' read only';
+ end loop;
+ execute immediate 'alter tablespace SYSAUX offline';
+ DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL('SYSTEM');
+ execute immediate 'alter tablespace SYSAUX online';
+ for t in (select tablespace_name from dba_tablespaces
+ where status = 'READ ONLY')
+ loop
+ execute immediate 'alter tablespace ' || t.tablespace_name || ' read write';
+ end loop;
+ end loop;
+end;
+/
+
+-- restart the instance to reinitialize the system parameters
+shutdown immediate
+startup
+
+-- lock default users from 9i
+select sysdate, 'Locking default 9i users' message from dual;
+BEGIN
+ FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN (
+ 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') )
+ LOOP
+ dbms_output.put_line('Locking and Expiring: ' || item.USERNAME);
+ execute immediate 'alter user ' || item.USERNAME || ' password expire account lock' ;
+ END LOOP;
+END;
+/
+
+-- set compatible flag
+alter system set compatible='10.2.0.4.0' scope=spfile;
+disconnect
+
+connect / as sysdba
+shutdown immediate
+
14 years, 11 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit bf7f6b39880cc4e91051b3e6c904b69bd22deaa3
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 1 13:17:12 2009 -0400
492206 - Fixed an issue ' bad cobbler template' parsing
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
index 6ffcf27..31f34be 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
@@ -71,7 +71,11 @@ public class KickstartManager extends BaseManager {
*/
public void validateKickstartFile(KickstartData ksdata) {
try {
- renderKickstart(ksdata);
+ String text = renderKickstart(ksdata);
+ if (text.contains("Traceback (most recent call last):")) {
+ ValidatorException.raiseException("kickstart.jsp.error.template_generation",
+ KickstartUrlHelper.getCobblerProfileUrl(ksdata));
+ }
}
catch (DownloadException de) {
ValidatorException.raiseException("kickstart.jsp.error.template_generation",
14 years, 11 months
Branch 'VADER' - java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 25eb35a04216418c1e818f5718977133990a5fd4
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 1 13:17:12 2009 -0400
492206 - Fixed an issue ' bad cobbler template' parsing
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
index 6ffcf27..31f34be 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
@@ -71,7 +71,11 @@ public class KickstartManager extends BaseManager {
*/
public void validateKickstartFile(KickstartData ksdata) {
try {
- renderKickstart(ksdata);
+ String text = renderKickstart(ksdata);
+ if (text.contains("Traceback (most recent call last):")) {
+ ValidatorException.raiseException("kickstart.jsp.error.template_generation",
+ KickstartUrlHelper.getCobblerProfileUrl(ksdata));
+ }
}
catch (DownloadException de) {
ValidatorException.raiseException("kickstart.jsp.error.template_generation",
14 years, 11 months
Branch 'VADER' - 3 commits - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
spacewalk/setup/share/oracle/upgrade-db.sh | 23 +++++++++++++++++------
2 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit f5484fc4226bf5d9ffb392af1b7e164c4a4dec7b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:40:02 2009 +0200
pass custom sid to upgrade-db.sh for embedded db upgrade
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 4282df2..247ace1 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -740,7 +740,7 @@ EOQ
-err_message => "Could not upgrade database.\n",
-err_code => 15,
-system_opts => ['/sbin/runuser', 'oracle', '-c',
- SHARED_DIR . '/oracle' . '/upgrade-db.sh' ]);
+ "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]);
system_or_exit(['service', 'oracle', 'restart'], 41,
'Could not restart oracle service');
commit 72af153f608a2d28b3926b1f811d23c846ad266a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:34:55 2009 +0200
update copyright information
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index 39b8abd..f082292 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -1,10 +1,18 @@
#!/bin/sh
-# Installs/creates the RHN embedded database at mountpoint /rhnsat
+# Upgrades RHN embedded database at mountpoint /rhnsat
#
-# Copyright (c) 2002-2004, Red Hat, Inc.
-# All rights reserved.
+# Copyright (c) 2008 Red Hat, Inc.
#
-# $Id: inst-rhnsat-db.sh,v 1.14 2008-03-17 10:54:36 mmraka Exp $
+# 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.
set -x
commit 62df9de7c034114c73e9cdf6bef8ccd70177df10
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:33:31 2009 +0200
support embedded db upgrade with custom sid
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index f9ad115..39b8abd 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -29,8 +29,11 @@ ORACLE_CONFIG_9I_DIR=$ORACLE_BASE/config/9.2.0
echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab
# change env to rhnsat instance
-ORACLE_SID=rhnsat
-export ORACLE_SID
+if [ -z $ORACLE_CUSTOM_SID ]; then
+ export ORACLE_SID=rhnsat
+else
+ export ORACLE_SID=$ORACLE_CUSTOM_SID
+fi
. oraenv
14 years, 11 months
3 commits - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
spacewalk/setup/share/oracle/upgrade-db.sh | 23 +++++++++++++++++------
2 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit b805c14527bc8e021d56310933b6e11d87806a19
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:40:02 2009 +0200
pass custom sid to upgrade-db.sh for embedded db upgrade
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 3e26616..f0cda94 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -740,7 +740,7 @@ EOQ
-err_message => "Could not upgrade database.\n",
-err_code => 15,
-system_opts => ['/sbin/runuser', 'oracle', '-c',
- SHARED_DIR . '/oracle' . '/upgrade-db.sh' ]);
+ "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]);
system_or_exit(['service', 'oracle', 'restart'], 41,
'Could not restart oracle service');
commit 1a7a72468ed4dddf37a245c417d9fa95ecc6f47c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:34:55 2009 +0200
update copyright information
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index 39b8abd..f082292 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -1,10 +1,18 @@
#!/bin/sh
-# Installs/creates the RHN embedded database at mountpoint /rhnsat
+# Upgrades RHN embedded database at mountpoint /rhnsat
#
-# Copyright (c) 2002-2004, Red Hat, Inc.
-# All rights reserved.
+# Copyright (c) 2008 Red Hat, Inc.
#
-# $Id: inst-rhnsat-db.sh,v 1.14 2008-03-17 10:54:36 mmraka Exp $
+# 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.
set -x
commit f678215dd3ba328b6e82b9b7a0e1a6beb45c0687
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 1 17:33:31 2009 +0200
support embedded db upgrade with custom sid
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index f9ad115..39b8abd 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -29,8 +29,11 @@ ORACLE_CONFIG_9I_DIR=$ORACLE_BASE/config/9.2.0
echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab
# change env to rhnsat instance
-ORACLE_SID=rhnsat
-export ORACLE_SID
+if [ -z $ORACLE_CUSTOM_SID ]; then
+ export ORACLE_SID=rhnsat
+else
+ export ORACLE_SID=$ORACLE_CUSTOM_SID
+fi
. oraenv
14 years, 11 months
backend/satellite_tools backend/server schema/spacewalk
by Pradeep Kilambi
backend/satellite_tools/xmlSource.py | 3 +--
backend/server/importlib/backendOracle.py | 5 ++---
backend/server/importlib/importLib.py | 3 +--
schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql | 10 +++-------
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql | 5 +++++
5 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit d40c47a6efc4a9f7b41fdd6b72219abcde80399f
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Jun 1 10:54:54 2009 -0400
503243 - Dropping the is_default column as we now determine the default in the app code based on the compatible eus channel instead of jus the default.
- Also unique constraint is on product,version,arch and release instead of is_default. This should fix the issue of syncing multiple eus channels to satellite.
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 0e5001f..0bfbda2 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -629,8 +629,7 @@ class ReleaseItem(BaseItem):
item_name = 'rhn-release'
item_class = importLib.ReleaseChannelMap
tagMap = {
- 'channel-arch' : 'channel_arch',
- 'is-default' : 'is_default',
+ 'channel-arch' : 'channel_arch'
}
addItem(ReleaseItem)
diff --git a/backend/server/importlib/backendOracle.py b/backend/server/importlib/backendOracle.py
index fddc8e4..99b53e7 100644
--- a/backend/server/importlib/backendOracle.py
+++ b/backend/server/importlib/backendOracle.py
@@ -314,10 +314,9 @@ class OracleBackend(Backend):
'version' : DBstring(64),
'release' : DBstring(64),
'channel_arch_id': DBint(),
- 'channel_id' : DBint(),
- 'is_default' : DBstring(1)
+ 'channel_id' : DBint()
},
- pk = ['product', 'version', 'release', 'channel_arch_id', 'channel_id', 'is_default'],
+ pk = ['product', 'version', 'release', 'channel_arch_id', 'channel_id'],
attribute = 'release',
defaultSeverity = 4,
),
diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py
index 10f8fed..ab9138c 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -170,8 +170,7 @@ class ReleaseChannelMap(Information):
'version' : StringType,
'release' : StringType,
'channel_arch_id' : IntType,
- 'channel_id' : IntType,
- 'is_default' : StringType,
+ 'channel_id' : IntType
}
diff --git a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
index bb950df..f95ca9f 100644
--- a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
+++ b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
@@ -25,11 +25,7 @@ rhnReleaseChannelMap
channel_arch_id number
constraint rhn_rcm_caid_nn not null,
channel_id number
- constraint rhn_rcm_cid_nn not null,
- is_default char(1)
- constraint rhn_rcm_default_nn not null,
- constraint rhn_rcm_default_ck
- check (is_default in ('Y', 'N'))
+ constraint rhn_rcm_cid_nn not null
)
enable row movement
;
@@ -40,7 +36,7 @@ create index rhn_rcm_prod_ver_rel_caid_idx
;
alter table rhnReleaseChannelMap
-add constraint rhn_rcm_pva_def_uniq
-unique (product, version, channel_arch_id, is_default)
+add constraint rhn_rcm_pvar_uniq
+unique (product, version, channel_arch_id, release)
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql
new file mode 100644
index 0000000..7383816
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql
@@ -0,0 +1,5 @@
+ALTER TABLE rhnReleaseChannelMap DROP CONSTRAINT rhn_rcm_pva_def_uniq;
+ALTER TABLE rhnReleaseChannelMap DROP COLUMN is_default;
+ALTER TABLE rhnReleaseChannelMap
+ADD CONSTRAINT rhn_rcm_pvar_uniq
+unique (product, version, channel_arch_id, release);
14 years, 11 months
Branch 'VADER' - backend/satellite_tools backend/server schema/spacewalk
by Pradeep Kilambi
backend/satellite_tools/xmlSource.py | 3 +--
backend/server/importlib/backendOracle.py | 5 ++---
backend/server/importlib/importLib.py | 3 +--
schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql | 10 +++-------
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql | 5 +++++
5 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 5bb7e31fce60fea12d596ab5a2cb33a09185f0c1
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Jun 1 10:54:54 2009 -0400
503243 - Dropping the is_default column as we now determine the default in the app code based on the compatible eus channel instead of jus the default.
- Also unique constraint is on product,version,arch and release instead of is_default. This should fix the issue of syncing multiple eus channels to satellite.
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 0e5001f..0bfbda2 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -629,8 +629,7 @@ class ReleaseItem(BaseItem):
item_name = 'rhn-release'
item_class = importLib.ReleaseChannelMap
tagMap = {
- 'channel-arch' : 'channel_arch',
- 'is-default' : 'is_default',
+ 'channel-arch' : 'channel_arch'
}
addItem(ReleaseItem)
diff --git a/backend/server/importlib/backendOracle.py b/backend/server/importlib/backendOracle.py
index fddc8e4..99b53e7 100644
--- a/backend/server/importlib/backendOracle.py
+++ b/backend/server/importlib/backendOracle.py
@@ -314,10 +314,9 @@ class OracleBackend(Backend):
'version' : DBstring(64),
'release' : DBstring(64),
'channel_arch_id': DBint(),
- 'channel_id' : DBint(),
- 'is_default' : DBstring(1)
+ 'channel_id' : DBint()
},
- pk = ['product', 'version', 'release', 'channel_arch_id', 'channel_id', 'is_default'],
+ pk = ['product', 'version', 'release', 'channel_arch_id', 'channel_id'],
attribute = 'release',
defaultSeverity = 4,
),
diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py
index 10f8fed..ab9138c 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -170,8 +170,7 @@ class ReleaseChannelMap(Information):
'version' : StringType,
'release' : StringType,
'channel_arch_id' : IntType,
- 'channel_id' : IntType,
- 'is_default' : StringType,
+ 'channel_id' : IntType
}
diff --git a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
index bb950df..f95ca9f 100644
--- a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
+++ b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql
@@ -25,11 +25,7 @@ rhnReleaseChannelMap
channel_arch_id number
constraint rhn_rcm_caid_nn not null,
channel_id number
- constraint rhn_rcm_cid_nn not null,
- is_default char(1)
- constraint rhn_rcm_default_nn not null,
- constraint rhn_rcm_default_ck
- check (is_default in ('Y', 'N'))
+ constraint rhn_rcm_cid_nn not null
)
enable row movement
;
@@ -40,7 +36,7 @@ create index rhn_rcm_prod_ver_rel_caid_idx
;
alter table rhnReleaseChannelMap
-add constraint rhn_rcm_pva_def_uniq
-unique (product, version, channel_arch_id, is_default)
+add constraint rhn_rcm_pvar_uniq
+unique (product, version, channel_arch_id, release)
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql
new file mode 100644
index 0000000..7383816
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql
@@ -0,0 +1,5 @@
+ALTER TABLE rhnReleaseChannelMap DROP CONSTRAINT rhn_rcm_pva_def_uniq;
+ALTER TABLE rhnReleaseChannelMap DROP COLUMN is_default;
+ALTER TABLE rhnReleaseChannelMap
+ADD CONSTRAINT rhn_rcm_pvar_uniq
+unique (product, version, channel_arch_id, release);
14 years, 11 months
Branch 'VADER' - java/code
by John Matthews
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java | 32 +++++-----
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit cd38fb8f41b7807ede602fc2d18a43031710db13
Author: John Matthews <jmatthew(a)redhat.com>
Date: Mon Jun 1 10:18:07 2009 -0400
PackageSearchHandler apidoc cleanup
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
index 2f04f84..5ff9fb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
@@ -49,7 +49,7 @@ import java.util.Set;
/**
* PackagesSearchHandler
* @version $Rev$
- * @xmlrpc.namespace packages
+ * @xmlrpc.namespace packages.search
* @xmlrpc.doc Methods to interface to package search capabilities in search server..
*/
public class PackagesSearchHandler extends BaseHandler {
@@ -88,7 +88,7 @@ public class PackagesSearchHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown on error.
*
* @xmlrpc.doc Search the lucene package indexes for all packages which
- * match the given query in name and description
+ * match the given query in name or description
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "query",
* "text to match in package name or description")
@@ -114,7 +114,7 @@ public class PackagesSearchHandler extends BaseHandler {
* match the given query in name or summary.
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "query",
- * "text to match in package name and description")
+ * "text to match in package name or summary")
* @xmlrpc.returntype
* #array()
* $PackageOverviewSerializer
@@ -139,10 +139,11 @@ public class PackagesSearchHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown on error.
*
* @xmlrpc.doc Advanced method to search lucene indexes with a passed in query written
- * in Lucene Query Parser syntax. Lucene Query Parser syntax is defined here:
- * http://lucene.apache.org/java/2_3_2/queryparsersyntax.html
+ * in Lucene Query Parser syntax.<br/>
+ * Lucene Query Parser syntax is defined
+ * <a href="http://lucene.apache.org/java/2_3_2/queryparsersyntax.html"> here</a>.<br/>
* Fields searchable for Packages:
- * name, epoch, version, release, arch, description, summary
+ * name, epoch, version, release, arch, description, summary<br/>
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -description:devel"
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "luceneQuery",
@@ -163,10 +164,11 @@ public class PackagesSearchHandler extends BaseHandler {
/**
* Advanced method to search lucene indexes with a passed in query written in Lucene
* Query Parser syntax, additionally this method will limit results to those which are
- * in the passed in channel label. Lucene Query Parser syntax is defined here:
+ * in the passed in channel label.<br/>
+ * Lucene Query Parser syntax is defined here:
* http://lucene.apache.org/java/2_3_2/queryparsersyntax.html
* Fields searchable for Packages:
- * name, epoch, version, release, arch, description, summary
+ * name, epoch, version, release, arch, description, summary<br/>
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -description:devel"
*
* @param sessionKey The sessionKey for the logged in used
@@ -177,10 +179,11 @@ public class PackagesSearchHandler extends BaseHandler {
*
* @xmlrpc.doc Advanced method to search lucene indexes with a passed in query written
* in Lucene Query Parser syntax, additionally this method will limit results to those
- * which are in the passed in channel label. Lucene Query Parser syntax is defined
- * here: http://lucene.apache.org/java/2_3_2/queryparsersyntax.html
+ * which are in the passed in channel label.<br/>
+ * Lucene Query Parser syntax is defined
+ * <a href="http://lucene.apache.org/java/2_3_2/queryparsersyntax.html"> here</a>.<br/>
* Fields searchable for Packages:
- * name, epoch, version, release, arch, description, summary
+ * name, epoch, version, release, arch, description, summary<br/>
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -description:devel"
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "luceneQuery",
@@ -238,10 +241,11 @@ public class PackagesSearchHandler extends BaseHandler {
*
* @xmlrpc.doc Advanced method to search lucene indexes with a passed in query written
* in Lucene Query Parser syntax, additionally this method will limit results to those
- * which are associated with a given activation key. Lucene Query Parser syntax is
- * defined here: http://lucene.apache.org/java/2_3_2/queryparsersyntax.html
+ * which are associated with a given activation key.<br/>
+ * Lucene Query Parser syntax is defined
+ * <a href="http://lucene.apache.org/java/2_3_2/queryparsersyntax.html"> here</a>.<br/>
* Fields searchable for Packages:
- * name, epoch, version, release, arch, description, summary
+ * name, epoch, version, release, arch, description, summary<br/>
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -description:devel"
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "luceneQuery",
14 years, 11 months